From b5312db413121bf3473f69d8ec9d1d52c7efef78 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Tue, 5 Nov 2024 10:38:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Layout/Layout.razor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss index b7109611b14..5d410ac7790 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss @@ -2,7 +2,7 @@ --bb-layout-header-height: #{$bb-layout-header-height}; --bb-layout-header-background: #{$bb-layout-header-background}; --bb-layout-header-color: #{$bb-layout-header-color}; - --bb-layout-headerbar-color: var(--bb-layout-header-color); + --bb-layout-headerbar-color: #{$bb-layout-header-color}; --bb-layout-headerbar-background: #{$bb-layout-headerbar-background}; --bb-layout-headerbar-border-color: #{$bb-layout-headerbar-border-color}; --bb-layout-headerbar-padding: #{$bb-layout-headerbar-padding}; From a70e8ef90403c3e744f36f97b4e4554147a80e59 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Tue, 5 Nov 2024 10:38:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20Layout=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=20Logout=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Layout/Layout.razor.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss index 5d410ac7790..6905fd8f392 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss @@ -18,6 +18,8 @@ --bb-layout-title-margin-left: #{$bb-layout-title-margin-left}; --bb-layout-banner-font-size: #{$bb-layout-banner-font-size}; --bb-layout-banner-logo-width: #{$bb-layout-banner-logo-width}; + --bb-layout-menu-user-banner-background: #{$bb-layout-menu-user-banner-background}; + --bb-layout-menu-user-border-color: #{$bb-layout-menu-user-border-color}; display: flex; height: 100%; width: 100%; @@ -122,6 +124,12 @@ width: calc(var(--bb-layout-header-height) - 6px); height: calc(var(--bb-layout-header-height) - 6px); } + + .dropdown-logout { + --bb-logout-text-color: var(--bb-layout-header-color); + --bb-logout-user-bg: var(--bb-layout-menu-user-banner-background); + --bb-logout-menu-border-color: var(--bb-layout-menu-user-border-color); + } } .layout-main { From 3e673e073322eae047132ceb2052e9be75a3bf01 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Tue, 5 Nov 2024 10:39:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?style:=20=E5=A2=9E=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/scss/theme/bootstrapblazor.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss index dd3ffc59dde..1fe4d4a2f46 100644 --- a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss +++ b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss @@ -321,8 +321,8 @@ $bb-ip-cell-max-width: 30px; // Layout $bb-layout-header-height: 50px; -$bb-layout-header-background: var(--bs-body-bg); -$bb-layout-header-color: var(--bs-body-color); +$bb-layout-header-background: #2c67be; +$bb-layout-header-color: rgb(200, 210, 228);; $bb-layout-headerbar-background: var(--bb-header-bg); $bb-layout-headerbar-border-color: var(--bs-border-color); $bb-layout-headerbar-padding: 4px 12px; @@ -331,13 +331,15 @@ $bb-layout-footer-color: var(--bs-body-color); $bb-layout-footer-height: 40px; $bb-layout-sidebar-width: 214px; $bb-layout-sidebar-collapse-width: 70px; -$bb-layout-sidebar-banner-background: var(--bs-body-bg); -$bb-layout-sidebar-background: var(--bs-body-bg); +$bb-layout-sidebar-banner-background: #2c67be; +$bb-layout-sidebar-background: #edf6ff; $bb-layout-sidebar-color: var(--bs-body-color); -$bb-layout-title-color: var(--bs-body-color); +$bb-layout-title-color: rgb(200, 210, 228); $bb-layout-title-margin-left: .5rem; $bb-layout-banner-font-size: 1.5rem; $bb-layout-banner-logo-width: 42px; +$bb-layout-menu-user-banner-background: #1b55aa; +$bb-layout-menu-user-border-color: #1b55aa; // Light $bb-light-bg: radial-gradient(circle, #fff, #aaa, #333); From 240145fa5a373b2eaec0db8c156ae7eb95fb781e Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Tue, 5 Nov 2024 10:55:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?style:=20=E5=A2=9E=E5=8A=A0=20=E4=BE=A7?= =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E8=8F=9C=E5=8D=95=E9=A2=9C=E8=89=B2=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Layout/Layout.razor.scss | 7 +++++++ .../wwwroot/scss/theme/bootstrapblazor.scss | 1 + 2 files changed, 8 insertions(+) diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss index 6905fd8f392..bcbcc408400 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss @@ -20,6 +20,7 @@ --bb-layout-banner-logo-width: #{$bb-layout-banner-logo-width}; --bb-layout-menu-user-banner-background: #{$bb-layout-menu-user-banner-background}; --bb-layout-menu-user-border-color: #{$bb-layout-menu-user-border-color}; + --bb-layout-menu-item-hover-bg: #{$bb-layout-menu-item-hover-bg}; display: flex; height: 100%; width: 100%; @@ -132,6 +133,12 @@ } } + .layout-menu { + .menu { + --bb-menu-item-hover-bg: var(--bb-layout-menu-item-hover-bg); + } + } + .layout-main { padding: 1rem; position: relative; diff --git a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss index 1fe4d4a2f46..ed3985eac1b 100644 --- a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss +++ b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss @@ -340,6 +340,7 @@ $bb-layout-banner-font-size: 1.5rem; $bb-layout-banner-logo-width: 42px; $bb-layout-menu-user-banner-background: #1b55aa; $bb-layout-menu-user-border-color: #1b55aa; +$bb-layout-menu-item-hover-bg: #9bc8f5; // Light $bb-light-bg: radial-gradient(circle, #fff, #aaa, #333); From 5ad59af154fa08a42c88ce5a59b64de79866a908 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Tue, 5 Nov 2024 11:05:57 +0800 Subject: [PATCH 5/5] chore: bump version 9.0.0-rc.2.11.3.1 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 4219d2a255e..2f8a60164c1 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 9.0.0-rc.2.11.3.0 + 9.0.0-rc.2.11.3.1