dohertj2/ScadaBridge
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Adopt Theme 1.0.0 with supported dark palette

Browse Source
This commit is contained in:
Joseph Doherty
2026-11-13 16:12:40 -05:00
parent f8c2851d25
commit cdd3adf6fc
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Directory.Packages.props
+1 -1
View File
@@ -119,7 +119,7 @@
<PackageVersion Include="ZB.MOM.WW.Auth.ApiKeys.SqlServer" Version="0.5.0" /> <PackageVersion Include="ZB.MOM.WW.Auth.ApiKeys.SqlServer" Version="0.5.0" />
<PackageVersion Include="ZB.MOM.WW.Auth.AspNetCore" Version="0.5.0" /> <PackageVersion Include="ZB.MOM.WW.Auth.AspNetCore" Version="0.5.0" />
<PackageVersion Include="ZB.MOM.WW.Audit" Version="0.1.0" /> <PackageVersion Include="ZB.MOM.WW.Audit" Version="0.1.0" />
<PackageVersion Include="ZB.MOM.WW.Theme" Version="0.5.3" /> <PackageVersion Include="ZB.MOM.WW.Theme" Version="1.0.0" />
<PackageVersion Include="ZB.MOM.WW.Secrets" Version="0.6.2" /> <PackageVersion Include="ZB.MOM.WW.Secrets" Version="0.6.2" />
<PackageVersion Include="ZB.MOM.WW.Secrets.Abstractions" Version="0.6.2" /> <PackageVersion Include="ZB.MOM.WW.Secrets.Abstractions" Version="0.6.2" />
<PackageVersion Include="ZB.MOM.WW.Secrets.Ui" Version="0.6.2" /> <PackageVersion Include="ZB.MOM.WW.Secrets.Ui" Version="0.6.2" />
src/ZB.MOM.WW.ScadaBridge.CentralUI/wwwroot/css/site.css
+31 -8
View File
@@ -120,19 +120,26 @@
--card: #25282d; --card: #25282d;
--ink: #e6e8ec; --ink: #e6e8ec;
--ink-soft: #9aa0aa; --ink-soft: #9aa0aa;
--ink-faint: #6b727c; --ink-faint: #a8b0bc;
--rule: #33373e; --rule: #33373e;
--rule-strong: #3a3f46; --rule-strong: #3a3f46;
/* Accent — lightened for contrast on dark */ /* Accent — lightened for contrast on dark */
--accent: #4d7fe8; --accent: #7aa0ef;
--accent-deep: #7aa0ef; --accent-deep: #9dbaf6;
--accent-tint: #1e2640;
--accent-border: #566d9c;
--accent-focus: #a7c1ff;
--on-accent: #111827;
/* Status — foregrounds unchanged (inherently visible on dark) */ /* Status — signal colors are retained; text uses the readable inks below. */
--ok: #40b856; --ok: #40b856;
--warn: #f0a030; --warn: #f0a030;
--bad: #f05050; --bad: #f05050;
--idle: #7a8290; --idle: #7a8290;
--ok-ink: #8ada96;
--bad-ink: #ff9d9d;
--idle-ink: #c3cad5;
/* Status — tinted backgrounds (dark surface tints) */ /* Status — tinted backgrounds (dark surface tints) */
--ok-bg: #1a2e1e; --ok-bg: #1a2e1e;
@@ -149,17 +156,18 @@
--bad-border-soft: #44201e; --bad-border-soft: #44201e;
/* Warning ink — brightened amber for dark contrast */ /* Warning ink — brightened amber for dark contrast */
--warn-ink: #d4891a; --warn-ink: #efbd63;
--warn-ink-deep: #b8741a; --warn-ink-deep: #efbd63;
/* Info tint */ /* Semantic information stays blue, independent of product accent. */
--info-ink: #b4c6ff;
--info-bg: #1a2240; --info-bg: #1a2240;
--info-border: #2a3660; --info-border: #2a3660;
/* Neutral surface washes */ /* Neutral surface washes */
--zebra-bg: #202328; --zebra-bg: #202328;
--hover-bg: #2a2e38; --hover-bg: #2a2e38;
--active-bg: #1e2640; --active-bg: var(--accent-tint);
/* Bootstrap bridge tokens */ /* Bootstrap bridge tokens */
--bs-body-bg: var(--paper); --bs-body-bg: var(--paper);
@@ -171,6 +179,21 @@
--sb-backdrop: rgba(0, 0, 0, 0.6); --sb-backdrop: rgba(0, 0, 0, 0.6);
} }
/* Supported-dark Bootstrap adapter: secondary actions use host surface inks. */
[data-bs-theme="dark"] .btn-outline-secondary {
--bs-btn-color: var(--ink-soft);
--bs-btn-border-color: var(--ink-soft);
--bs-btn-hover-color: var(--card);
--bs-btn-hover-bg: var(--ink-soft);
--bs-btn-hover-border-color: var(--ink-soft);
--bs-btn-active-color: var(--card);
--bs-btn-active-bg: var(--ink-soft);
--bs-btn-active-border-color: var(--ink-soft);
--bs-btn-disabled-color: var(--ink-soft);
--bs-btn-disabled-bg: transparent;
--bs-btn-disabled-border-color: var(--ink-soft);
}
/* ── Rail pending-updates indicator ────────────────────────────────────── /* ── Rail pending-updates indicator ──────────────────────────────────────
Sits in .rail-foot just above .rail-user. One line when quiet, two when Sits in .rail-foot just above .rail-user. One line when quiet, two when
something is pending; tokens only so dark mode follows for free. */ something is pending; tokens only so dark mode follows for free. */
tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs
+2 -3
View File
@@ -143,7 +143,7 @@ public class NotificationReportDetailModalTests : BunitContext
/// <summary>Verifies that close button, dismisses modal.</summary> /// <summary>Verifies that close button, dismisses modal.</summary>
[Fact] [Fact]
public void CloseButton_DismissesModal() public async Task CloseButton_DismissesModal()
{ {
var cut = Render<NotificationReportPage>(); var cut = Render<NotificationReportPage>();
cut.WaitForState(() => cut.Markup.Contains("Pump fault at Plant-A")); cut.WaitForState(() => cut.Markup.Contains("Pump fault at Plant-A"));
@@ -154,8 +154,7 @@ public class NotificationReportDetailModalTests : BunitContext
cut.WaitForState(() => cut.FindAll(".modal.show").Count > 0); cut.WaitForState(() => cut.FindAll(".modal.show").Count > 0);
var closeButton = cut.Find(".modal.show .modal-footer button"); await cut.InvokeAsync(() => cut.Find(".modal.show .modal-footer button").Click());
closeButton.Click();
cut.WaitForAssertion(() => Assert.Empty(cut.FindAll(".modal.show"))); cut.WaitForAssertion(() => Assert.Empty(cut.FindAll(".modal.show")));
} }