From e68a3a4fb192cd382c59f78ef8dfec62a23192e1 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Mon, 30 Oct 2023 17:15:24 -0600 Subject: [PATCH] Make banners similar between frameworks (#24050) --- .../src/main/webapp/app/modules/home/home.tsx.ejs | 2 +- .../app/shared/layout/header/header-components.tsx.ejs | 2 +- .../main/webapp/app/shared/layout/header/header.scss.ejs | 9 +++++---- .../main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs | 7 +++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs index 4ec609a1171..24a4b2ce922 100644 --- a/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs @@ -50,7 +50,7 @@ export const Home = () => { -

Welcome, <%= backendType %> Hipster!

+

Welcome, <%= backendType %> Hipster!

This is your homepage

{ (account?.login) ? ( diff --git a/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs b/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs index c40aaab9b19..1e0b1a212de 100644 --- a/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs @@ -36,7 +36,7 @@ export const Brand = () => ( <%= capitalizedBaseName %> - {VERSION} + {VERSION.toLowerCase().startsWith('v') ? VERSION : `v${VERSION}`} ); diff --git a/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs b/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs index db8081020eb..3d1e69e14b0 100644 --- a/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs @@ -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; @@ -105,7 +105,7 @@ Navbar styles } .navbar-version { - font-size: 10px; + font-size: 0.65em; color: $header-color-secondary; padding: 0 0 0 10px; } @@ -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; diff --git a/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs b/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs index c599b54c8b5..59cb505174b 100644 --- a/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs @@ -177,7 +177,7 @@ Navbar ========================================================================== */ .navbar-version { - font-size: 10px; + font-size: 0.65em; <%_ if (clientThemeNone) { _%> color: #ccc; <%_ } _%> @@ -243,7 +243,6 @@ .navbar-title { display: inline-block; - vertical-align: middle; <%_ if (clientThemeNone && !clientThemeDark) { _%> color: white; <%_ } _%> @@ -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 {