From 7e44d0fd12b2ddc83ecece0aeac42d3030db6d28 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 16 Oct 2025 17:15:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/SelectCity.razor.css | 6 +++++ .../Components/SelectRegion.razor.css | 24 ++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css b/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css index 9b99033f..34d7fab1 100644 --- a/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css +++ b/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css @@ -53,3 +53,9 @@ font-weight: bold; cursor: pointer; } + +[data-bs-theme="dark"] .bb-region-body { + --bb-region-body-color: #b5b5c3; + --bb-region-body-hover-color: #000; + --bb-region-body-active-color: #000; +} \ No newline at end of file diff --git a/src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css b/src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css index 978fceb8..d75ead52 100644 --- a/src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css +++ b/src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css @@ -1,4 +1,16 @@ -.bb-region { +.popover-region { + --bb-region-body-color: #777; + --bb-region-body-hover-color: #000; + --bb-region-body-active-color: #000; +} + +[data-bs-theme="dark"] .bb-region-body { + --bb-region-body-color: #b5b5c3; + --bb-region-body-hover-color: #000; + --bb-region-body-active-color: #000; +} + +.bb-region { position: relative; } @@ -41,12 +53,12 @@ .bb-region-header ul li.active { background-color: #e3e3e3; - color: #000; + color: var(--bb-region-body-active-color); } .bb-region-header ul li:hover { background-color: #e3e3e3; - color: #000; + color: var(--bb-region-body-hover-color); } .bb-region-body { @@ -68,15 +80,15 @@ padding: 3px 12px; border-radius: var(--bs-border-radius); cursor: pointer; - color: #777; + color: var(--bb-region-body-color); } .bb-region-body ul li:hover { background-color: #e9ecef; - color: #000; + color: var(--bb-region-body-hover-color); } .bb-region-body ul li.active { background-color: #e3e3e3; - color: #000; + color: var(--bb-region-body-active-color); } From 6b6b54b7894b27b5acc6ed5c0ad725bb246a96ed Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 16 Oct 2025 18:07:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/SelectCity.razor.css | 46 +++++++++------ .../Components/SelectRegion.razor.css | 58 +++++++++++-------- 2 files changed, 63 insertions(+), 41 deletions(-) diff --git a/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css b/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css index 34d7fab1..37e1a5e6 100644 --- a/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css +++ b/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css @@ -9,8 +9,18 @@ .dropdown-menu { --bs-dropdown-padding-y: .5rem; --bs-dropdown-padding-x: .5rem; - max-width: 400px; - max-height: 400px; + --bb-region-body-color: #495057; + --bb-region-body-hover-bg-color: #e9ecef; + --bb-region-body-active-bg-color: #dee2e6; + --bb-region-body-hover-color: #000; + --bb-region-body-active-color: #000; + --bb-region-body-width: 400px; + --bb-region-body-height: 400px; + --bb-region-body-padding: .5rem; + --bb-region-body-item-padding: 3px 12px; + --bb-region-body-gap: 5px; + width: var(--bb-region-body-width); + height: var(--bb-region-body-height); overflow-y: auto; } @@ -19,28 +29,36 @@ padding: 0; display: flex; flex-wrap: wrap; - gap: 5px; + gap: var(--bb-region-body-gap); } .dropdown-menu li { list-style: none; transition: background-color .3s linear, color .3s linear; cursor: pointer; - padding: 3px 12px; + padding: var(--bb-region-body-item-padding); border-radius: var(--bs-border-radius); - color: #777; + color: var(--bb-region-body-color); } .dropdown-menu li:hover { - background-color: #e9ecef; - color: #000; + background-color: var(--bb-region-body-hover-bg-color); + color: var(--bb-region-body-hover-color); } .dropdown-menu li.active { - background-color: #e3e3e3; - color: #000; + background-color: var(--bb-region-body-active-bg-color); + color: var(--bb-region-body-active-color); } +[data-bs-theme="dark"] .dropdown-menu { + --bb-region-body-color: #ddd; + --bb-region-body-hover-color: #fff; + --bb-region-body-active-color: #fff; + --bb-region-body-hover-bg-color: #495057; + --bb-region-body-active-bg-color: #6c757d; +} + .bb-region-city-item:not(:last-child) { margin-bottom: 3px; padding-bottom: 3px; @@ -48,14 +66,8 @@ } .bb-region-city-title { - padding: 3px 12px; - color: #000; + padding: var(--bb-region-body-item-padding); + color: var(--bb-region-body-color); font-weight: bold; cursor: pointer; } - -[data-bs-theme="dark"] .bb-region-body { - --bb-region-body-color: #b5b5c3; - --bb-region-body-hover-color: #000; - --bb-region-body-active-color: #000; -} \ No newline at end of file diff --git a/src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css b/src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css index d75ead52..e19b5261 100644 --- a/src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css +++ b/src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css @@ -1,16 +1,4 @@ -.popover-region { - --bb-region-body-color: #777; - --bb-region-body-hover-color: #000; - --bb-region-body-active-color: #000; -} - -[data-bs-theme="dark"] .bb-region-body { - --bb-region-body-color: #b5b5c3; - --bb-region-body-hover-color: #000; - --bb-region-body-active-color: #000; -} - -.bb-region { +.bb-region { position: relative; } @@ -20,6 +8,18 @@ .dropdown-menu { --bs-dropdown-padding-y: 0; + --bb-region-header-padding: 3px 12px; + --bb-region-header-hover-bg-color: #e9ecef; + --bb-region-header-active-bg-color: #dee2e6; + --bb-region-body-color: #495057; + --bb-region-body-hover-bg-color: #e9ecef; + --bb-region-body-active-bg-color: #dee2e6; + --bb-region-body-hover-color: #000; + --bb-region-body-active-color: #000; + --bb-region-body-width: 400px; + --bb-region-body-padding: .5rem; + --bb-region-body-item-padding: 3px 12px; + --bb-region-body-gap: 5px; } .dropdown-menu ul { @@ -32,8 +32,18 @@ transition: background-color .3s linear, color .3s linear; } +[data-bs-theme="dark"] .dropdown-menu { + --bb-region-header-hover-bg-color: #495057; + --bb-region-header-active-bg-color: #6c757d; + --bb-region-body-color: #ddd; + --bb-region-body-hover-color: #fff; + --bb-region-body-active-color: #fff; + --bb-region-body-hover-bg-color: #495057; + --bb-region-body-active-bg-color: #6c757d; +} + .bb-region-header { - width: 400px; + width: var(--bb-region-body-width); border-bottom: 1px solid var(--bs-border-color); } @@ -47,29 +57,29 @@ .bb-region-header ul li { cursor: pointer; - padding: 3px 12px; + padding: var(--bb-region-header-padding); border-radius: var(--bs-border-radius); } .bb-region-header ul li.active { - background-color: #e3e3e3; + background-color: var(--bb-region-header-active-bg-color); color: var(--bb-region-body-active-color); } .bb-region-header ul li:hover { - background-color: #e3e3e3; + background-color: var(--bb-region-header-hover-bg-color); color: var(--bb-region-body-hover-color); } .bb-region-body { - padding: .5rem; - width: 400px; + padding: var(--bb-region-body-padding); + width: var(--bb-region-body-width); } .bb-region-body ul { display: flex; flex-wrap: wrap; - gap: 5px; + gap: var(--bb-region-body-gap); } .bb-region-body .bb-region-body-item:not(.active) { @@ -77,18 +87,18 @@ } .bb-region-body ul li { - padding: 3px 12px; + padding: var(--bb-region-body-item-padding); border-radius: var(--bs-border-radius); - cursor: pointer; color: var(--bb-region-body-color); + cursor: pointer; } .bb-region-body ul li:hover { - background-color: #e9ecef; + background-color: var(--bb-region-body-hover-bg-color); color: var(--bb-region-body-hover-color); } .bb-region-body ul li.active { - background-color: #e3e3e3; + background-color: var(--bb-region-body-active-bg-color); color: var(--bb-region-body-active-color); } From ea156a52147a2398bfd5bcb622a51d22227588de Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 16 Oct 2025 18:10:42 +0800 Subject: [PATCH 3/3] chore: bump version 9.0.2 --- .../BootstrapBlazor.Region/BootstrapBlazor.Region.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj b/src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj index b8ef9ff5..f2a99d7d 100644 --- a/src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj +++ b/src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj @@ -1,7 +1,7 @@  - 9.0.1 + 9.0.2