Skip to content

Commit

Permalink
Make banners similar between frameworks (#24050)
Browse files Browse the repository at this point in the history
  • Loading branch information
mraible authored Oct 30, 2023
1 parent b2da792 commit e68a3a4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const Home = () => {
<span className="hipster rounded" />
</Col>
<Col md="9">
<h2><Translate contentKey="home.title">Welcome, <%= backendType %> Hipster!</Translate></h2>
<h1 className="display-4"><Translate contentKey="home.title">Welcome, <%= backendType %> Hipster!</Translate></h1>
<p className="lead"><Translate contentKey="home.subtitle">This is your homepage</Translate></p>
{
(account?.login) ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const Brand = () => (
<NavbarBrand tag={Link} to="/" className="brand-logo">
<BrandIcon />
<span className="brand-title"><Translate contentKey="global.title"><%= capitalizedBaseName %></Translate></span>
<span className="navbar-version">{VERSION}</span>
<span className="navbar-version">{VERSION.toLowerCase().startsWith('v') ? VERSION : `v${VERSION}`}</span>
</NavbarBrand>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Developement Ribbon
transform: rotate(-45deg);
overflow: hidden;
position: absolute;
top: 30px;
top: 40px;
white-space: nowrap;
width: 15em;
z-index: 99999;
Expand Down Expand Up @@ -105,7 +105,7 @@ Navbar styles
}

.navbar-version {
font-size: 10px;
font-size: 0.65em;
color: $header-color-secondary;
padding: 0 0 0 10px;
}
Expand All @@ -119,13 +119,14 @@ Navbar styles
width: auto;
display: inline-block;
img {
height: 45px;
width: 45px;
}
}
}

.brand-title {
font-size: 24px;
font-size: 1.25rem;
margin-left: .25rem;
color: $header-color;
&:hover {
color: $header-color-hover;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
Navbar
========================================================================== */
.navbar-version {
font-size: 10px;
font-size: 0.65em;
<%_ if (clientThemeNone) { _%>
color: #ccc;
<%_ } _%>
Expand Down Expand Up @@ -243,7 +243,6 @@
.navbar-title {
display: inline-block;
vertical-align: middle;
<%_ if (clientThemeNone && !clientThemeDark) { _%>
color: white;
<%_ } _%>
Expand All @@ -253,14 +252,14 @@
Logo styles
========================================================================== */
.navbar-brand.logo {
padding: 5px 15px;
padding: 0 7px;
}
.logo .logo-img {
height: 45px;
display: inline-block;
vertical-align: middle;
width: 70px;
width: 45px;
}
.logo-img {
Expand Down

0 comments on commit e68a3a4

Please sign in to comment.