From 77a609b6a1dd817e92f0698fff90bd8e806ef9b8 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Wed, 22 Jul 2026 15:30:25 -0400
Subject: [PATCH 01/10] Reapply "feat(header): gate consolidated
 <unraid-header> on Unraid 7.3+"

This reverts commit 6f4f2fdf416fe68fa33b27e239a40471ab6d9fa5.
---
 emhttp/plugins/dynamix/DisplaySettings.page   |  6 +++
 emhttp/plugins/dynamix/default.cfg            |  1 +
 .../include/DefaultPageLayout/Header.php      | 50 ++++++++++++++++++-
 .../plugins/dynamix/styles/default-base.css   | 38 +++++++++++++-
 4 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 741f173212..30117fb823 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -260,6 +260,12 @@ _(Dynamix color theme)_:
   <?endforeach; // $themeHelper set in DefaultPageLayout.php ?>
   </select>
 
+_(Header logo style)_:
+: <select name="headerLogo">
+  <?=mk_option($display['headerLogo'] ?? "", "", _('Gradient'))?>
+  <?=mk_option($display['headerLogo'] ?? "", "theme", _('Theme adaptive'))?>
+  </select>
+
 _(Used / Free columns)_:
 : <select name="text">
   <?=mk_option($display['text'], "0", _('Text'))?>
diff --git a/emhttp/plugins/dynamix/default.cfg b/emhttp/plugins/dynamix/default.cfg
index d10aee010e..d862d7fcde 100644
--- a/emhttp/plugins/dynamix/default.cfg
+++ b/emhttp/plugins/dynamix/default.cfg
@@ -29,6 +29,7 @@ hotssd="60"
 maxssd="70"
 power=""
 theme="white"
+headerLogo=""
 locale=""
 raw=""
 rtl=""
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 579dd637df..f557e2ca30 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -1,7 +1,55 @@
-<div id="header" class="<?=$display['banner']?>">
+<?php
+// Unraid 7.3+ ships a single consolidated header web component (<unraid-header>)
+// that owns the whole header and its responsive layout. Older releases keep the
+// legacy multi-component header (logo/version + user profile) as a fallback.
+$headerOsVersion = @parse_ini_file('/etc/unraid-version')['version'] ?? '0';
+$headerUseConsolidated = version_compare($headerOsVersion, '7.3', '>=');
+$headerClass = trim($display['banner'] . ($headerUseConsolidated ? ' unraid-consolidated-header' : ''));
+?>
+<div id="header" class="<?=$headerClass?>">
+<?php if ($headerUseConsolidated): ?>
+    <?php
+        require_once "$docroot/plugins/dynamix.my.servers/include/state.php";
+        $headerServerState = new ServerState();
+    ?>
+    <script>
+    window.LOCALE = <?= json_encode($_SESSION['locale'] ?? 'en_US', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP) ?>;
+    </script>
+    <?php
+        // The consolidated header owns the array-usage bar for sidebar themes,
+        // where the legacy #array-usage-sidenav widget used to be injected.
+        $headerShowArrayUsage = ($display['usage'] && $themeHelper->isSidebarTheme()) ? 'true' : 'false';
+        $headerLogoStyle = (($display['headerLogo'] ?? '') === 'theme') ? 'theme' : '';
+    ?>
+    <style>
+        /* Light-DOM fallback: paint the logo before <unraid-header> mounts so the
+           header does not pop in on page load. #header is already
+           display:flex; align-items:center, so the logo lands left + vertically
+           centered where the mounted logo sits. The mount engine calls
+           replaceChildren(), so this markup is discarded when the component
+           upgrades. */
+        #header.unraid-consolidated-header .unraid-header-boot-logo {
+            display: inline-flex;
+            align-items: center;
+        }
+        #header.unraid-consolidated-header .unraid-header-boot-logo img {
+            width: 14rem;
+            max-width: 100%;
+            max-height: 3rem;
+            height: auto;
+            object-fit: contain;
+        }
+    </style>
+    <unraid-header
+        server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
+        show-array-usage="<?= $headerShowArrayUsage ?>"
+        header-logo-style="<?= $headerLogoStyle ?>"
+    ><a class="unraid-header-boot-logo" href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><img src="/webGui/images/UN-logotype-gradient.svg" alt="Unraid" /></a></unraid-header>
+<?php else: ?>
     <unraid-header-os-version></unraid-header-os-version>
     <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>
         <span id='array-usage-sidenav'></span>
     <? endif; ?>
     <?include "$docroot/plugins/dynamix.my.servers/include/myservers2.php"?>
+<?php endif; ?>
 </div>
diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index 6dfa65cea8..be0b8dba8a 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -476,6 +476,33 @@ textarea:where(:not(.unapi *)) {
     align-self: stretch;
 }
 
+#header.unraid-consolidated-header {
+    align-items: stretch;
+    gap: 0;
+    min-height: 86px;
+    padding-left: 0;
+    background-size: 100% 86px;
+}
+
+#header.unraid-consolidated-header unraid-header {
+    align-self: stretch;
+    display: block;
+    width: 100%;
+}
+
+#header.unraid-consolidated-header #UnraidHeader {
+    min-height: inherit;
+    padding: .5rem 1rem;
+}
+
+#header.unraid-consolidated-header .block {
+    background-color: transparent;
+    float: none;
+    margin: 0;
+    padding: 0;
+    text-align: inherit;
+}
+
 /**
  * Tools page, rotate the Downgrade icon to prevent needing to add a new icon to the icon font.
  * The pseudo element is targeted here otherwise the rotation of the span would mess up spacing with the text.
@@ -2407,6 +2434,15 @@ div#title.ud {
         padding-left: 80px;
     }
 
+    #header.unraid-consolidated-header {
+        padding-left: 0;
+    }
+
+    #header.unraid-consolidated-header #UnraidHeader {
+        padding-left: calc(64px + 1rem);
+        padding-right: 1rem;
+    }
+
     #header .logo {
         margin-left: 0;
         color: var(--brand-red);
@@ -2814,4 +2850,4 @@ div#title.ud {
     label.checkbox input:checked ~ .checkmark {
         background-color: var(--brand-orange);
     }
-}
\ No newline at end of file
+}

From 91c75456e1172e25339d42ca118d9d02ca201179 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Wed, 22 Jul 2026 15:15:51 -0400
Subject: [PATCH 02/10] fix(header): match boot logo to mounted logo to remove
 mount jump/flash

The pre-mount boot logo placeholder was a single centered 14rem <img>, while the
mounted <unraid-header> logo is 16rem on desktop, sits higher (grouped with the
version), is centered below the uptime strip on mobile, and renders as an inline
SVG. That mismatch made the logo visibly resize, jump, and shimmer on mount.

Reproduce the mounted logo's box in the static placeholder: match the responsive
14rem/16rem width, add an invisible version stub so it centers as the same group
on desktop (same top offset), center below the uptime strip on mobile, and
render the same inline gradient SVG (identical element/rendering to the mounted
logo, and no separate asset fetch). The logo now stays put and paints seamlessly
when the component upgrades.
---
 .../include/DefaultPageLayout/Header.php      | 42 +++++++++++++++++--
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index f557e2ca30..c783771c12 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -30,21 +30,55 @@
            upgrades. */
         #header.unraid-consolidated-header .unraid-header-boot-logo {
             display: inline-flex;
-            align-items: center;
+            flex-direction: column;
+            align-items: flex-start;
+            justify-content: center;
+            gap: 0.8rem;
         }
-        #header.unraid-consolidated-header .unraid-header-boot-logo img {
+        #header.unraid-consolidated-header .unraid-header-boot-logo svg {
+            display: block;
             width: 14rem;
             max-width: 100%;
             max-height: 3rem;
             height: auto;
-            object-fit: contain;
+        }
+        /* Invisible stub that reproduces the mounted version pill so the boot
+           logo sits at the same top offset as the mounted logo+version group
+           instead of jumping up on mount. Only at sm+, where the mounted layout
+           groups them; below sm the mounted logo is centered, matching the
+           stub-less centered boot logo. */
+        #header.unraid-consolidated-header .unraid-header-boot-version {
+            display: none;
+        }
+        @media (min-width: 30rem) {
+            #header.unraid-consolidated-header .unraid-header-boot-logo svg {
+                width: 16rem;
+            }
+        }
+        @media (min-width: 640px) {
+            #header.unraid-consolidated-header .unraid-header-boot-version {
+                display: block;
+                height: 1.4rem;
+            }
+        }
+        /* Below sm the mounted host is stretched and the logo is centered in the
+           space beneath the uptime strip. Fill the host and center the boot logo
+           with the same top offset so it lands where the mounted logo does
+           instead of pinning to the top. */
+        @media (max-width: 639.98px) {
+            #header.unraid-consolidated-header .unraid-header-boot-logo {
+                height: 100%;
+                box-sizing: border-box;
+                justify-content: center;
+                padding-top: 2rem;
+            }
         }
     </style>
     <unraid-header
         server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
         show-array-usage="<?= $headerShowArrayUsage ?>"
         header-logo-style="<?= $headerLogoStyle ?>"
-    ><a class="unraid-header-boot-logo" href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><img src="/webGui/images/UN-logotype-gradient.svg" alt="Unraid" /></a></unraid-header>
+    ><span class="unraid-header-boot-logo"><a href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 222.36 39.04" aria-hidden="true"><defs><linearGradient id="unraid-header-boot-logo-gradient" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path fill="url(#unraid-header-boot-logo-gradient)" d="M146.7,29.47H135l-3,9h-6.49L138.93,0h8l13.41,38.49h-7.09L142.62,6.93l-5.83,16.88h8ZM29.69,0V25.4c0,8.91-5.77,13.64-14.9,13.64S0,34.31,0,25.4V0H6.54V25.4c0,5.17,3.19,7.92,8.25,7.92s8.36-2.75,8.36-7.92V0ZM50.86,12v26.5H44.31V0h6.11l17,26.5V0H74V38.49H67.9ZM171.29,0h6.54V38.49h-6.54Zm51.07,24.69c0,9-5.88,13.8-15.17,13.8H192.67V0H207.3c9.18,0,15.06,4.78,15.06,13.8ZM215.82,13.8c0-5.28-3.3-8.14-8.52-8.14h-8.08V32.77h8c5.33,0,8.63-2.8,8.63-8.08ZM108.31,23.92c4.34-1.6,6.93-5.28,6.93-11.55C115.24,3.68,110.18,0,102.48,0H88.84V38.49h6.55V5.66h6.87c3.8,0,6.21,1.82,6.21,6.71s-2.41,6.76-6.21,6.76H98.88l9.21,19.36h7.53Z"/></svg></a><span class="unraid-header-boot-version" aria-hidden="true"></span></span></unraid-header>
 <?php else: ?>
     <unraid-header-os-version></unraid-header-os-version>
     <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>

From 2a55f3940cc02733c5bfe6ad44fb7221fc3d3244 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Wed, 22 Jul 2026 22:15:40 -0400
Subject: [PATCH 03/10] fix(header): gate consolidated header on Unraid 7.4+
 (was 7.3+)

The consolidated <unraid-header> ships with 7.4, so raise the
version_compare gate and its fallback boundary from 7.3 to 7.4.
---
 emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index c783771c12..68d5de7aa1 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -1,9 +1,9 @@
 <?php
-// Unraid 7.3+ ships a single consolidated header web component (<unraid-header>)
+// Unraid 7.4+ ships a single consolidated header web component (<unraid-header>)
 // that owns the whole header and its responsive layout. Older releases keep the
 // legacy multi-component header (logo/version + user profile) as a fallback.
 $headerOsVersion = @parse_ini_file('/etc/unraid-version')['version'] ?? '0';
-$headerUseConsolidated = version_compare($headerOsVersion, '7.3', '>=');
+$headerUseConsolidated = version_compare($headerOsVersion, '7.4', '>=');
 $headerClass = trim($display['banner'] . ($headerUseConsolidated ? ' unraid-consolidated-header' : ''));
 ?>
 <div id="header" class="<?=$headerClass?>">

From d5b1cccb7b4f03f5ea210efdaf09f2f138be31ee Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Fri, 24 Jul 2026 10:23:30 -0400
Subject: [PATCH 04/10] fix(header): remove version gate, always use
 consolidated header

The consolidated header code only ships in 7.4+, so the version_compare
gate against /etc/unraid-version was redundant.
---
 .../include/DefaultPageLayout/Header.php        | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 68d5de7aa1..cdd92fb130 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -1,13 +1,9 @@
 <?php
-// Unraid 7.4+ ships a single consolidated header web component (<unraid-header>)
-// that owns the whole header and its responsive layout. Older releases keep the
-// legacy multi-component header (logo/version + user profile) as a fallback.
-$headerOsVersion = @parse_ini_file('/etc/unraid-version')['version'] ?? '0';
-$headerUseConsolidated = version_compare($headerOsVersion, '7.4', '>=');
-$headerClass = trim($display['banner'] . ($headerUseConsolidated ? ' unraid-consolidated-header' : ''));
+// This webGUI ships a single consolidated header web component (<unraid-header>)
+// that owns the whole header and its responsive layout.
+$headerClass = trim($display['banner'] . ' unraid-consolidated-header');
 ?>
 <div id="header" class="<?=$headerClass?>">
-<?php if ($headerUseConsolidated): ?>
     <?php
         require_once "$docroot/plugins/dynamix.my.servers/include/state.php";
         $headerServerState = new ServerState();
@@ -79,11 +75,4 @@
         show-array-usage="<?= $headerShowArrayUsage ?>"
         header-logo-style="<?= $headerLogoStyle ?>"
     ><span class="unraid-header-boot-logo"><a href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 222.36 39.04" aria-hidden="true"><defs><linearGradient id="unraid-header-boot-logo-gradient" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path fill="url(#unraid-header-boot-logo-gradient)" d="M146.7,29.47H135l-3,9h-6.49L138.93,0h8l13.41,38.49h-7.09L142.62,6.93l-5.83,16.88h8ZM29.69,0V25.4c0,8.91-5.77,13.64-14.9,13.64S0,34.31,0,25.4V0H6.54V25.4c0,5.17,3.19,7.92,8.25,7.92s8.36-2.75,8.36-7.92V0ZM50.86,12v26.5H44.31V0h6.11l17,26.5V0H74V38.49H67.9ZM171.29,0h6.54V38.49h-6.54Zm51.07,24.69c0,9-5.88,13.8-15.17,13.8H192.67V0H207.3c9.18,0,15.06,4.78,15.06,13.8ZM215.82,13.8c0-5.28-3.3-8.14-8.52-8.14h-8.08V32.77h8c5.33,0,8.63-2.8,8.63-8.08ZM108.31,23.92c4.34-1.6,6.93-5.28,6.93-11.55C115.24,3.68,110.18,0,102.48,0H88.84V38.49h6.55V5.66h6.87c3.8,0,6.21,1.82,6.21,6.71s-2.41,6.76-6.21,6.76H98.88l9.21,19.36h7.53Z"/></svg></a><span class="unraid-header-boot-version" aria-hidden="true"></span></span></unraid-header>
-<?php else: ?>
-    <unraid-header-os-version></unraid-header-os-version>
-    <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>
-        <span id='array-usage-sidenav'></span>
-    <? endif; ?>
-    <?include "$docroot/plugins/dynamix.my.servers/include/myservers2.php"?>
-<?php endif; ?>
 </div>

From a92ad192268da59b902fa1d525cea77aa43541ed Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Fri, 24 Jul 2026 10:42:36 -0400
Subject: [PATCH 05/10] fix(header): stretch consolidated header banner to
 actual box height

background-size: 100% 86px assumed a fixed height, but the consolidated
header grows with its content (meta row, array-usage bar), so the banner
image was getting cropped once the box exceeded 86px.
---
 emhttp/plugins/dynamix/styles/default-base.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index be0b8dba8a..f98e7a692a 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -481,7 +481,10 @@ textarea:where(:not(.unapi *)) {
     gap: 0;
     min-height: 86px;
     padding-left: 0;
-    background-size: 100% 86px;
+    /* The consolidated header's actual height grows with its content (meta
+       row, array-usage bar), so a fixed background-size crops the banner
+       image once the box exceeds it. Stretch to the box's real size instead. */
+    background-size: 100% 100%;
 }
 
 #header.unraid-consolidated-header unraid-header {

From 304c0151caaaba8d4af54924fbe34fb983e2f441 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Fri, 24 Jul 2026 17:19:22 -0400
Subject: [PATCH 06/10] fix(header): eliminate boot-logo mount jump +
 theme-aware boot logo

The light-DOM boot placeholder must land exactly where the mounted
<unraid-header> logo/version render, or the logo jumps on upgrade (QA
FAIL: ~12px down on desktop, plus right on sidebar themes).

- Pin the boot logo/version to the measured mounted positions (logo top
  12px desktop / 28px mobile; version follows at a 13px visual gap). Use
  px, not rem: the webgui light DOM roots at 62.5% (1rem=10px) while the
  mounted .unapi scope roots at 16px, so rem rendered the version
  half-size (the size flash).
- Render a real version placeholder (info icon + OS version) mirroring
  the mounted HeaderVersion so the group height matches by construction.
- Share #UnraidHeader's left inset with the boot logo so the horizontal
  position tracks across breakpoints.
- Boot logo now honors the theme-adaptive (black/white) logo option like
  the mounted HeaderLogo, not just the gradient.

Verified on devgen.local (7.3.2): boot vs mounted match within <1px at
375px and 1280px.
---
 .../include/DefaultPageLayout/Header.php      | 79 ++++++++++++-------
 .../plugins/dynamix/styles/default-base.css   | 15 +++-
 2 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index cdd92fb130..5d188afb8a 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -16,20 +16,35 @@
         // where the legacy #array-usage-sidenav widget used to be injected.
         $headerShowArrayUsage = ($display['usage'] && $themeHelper->isSidebarTheme()) ? 'true' : 'false';
         $headerLogoStyle = (($display['headerLogo'] ?? '') === 'theme') ? 'theme' : '';
+        // OS version for the boot version placeholder, so the light-DOM logo+version
+        // group matches the mounted logo+version group (mounted shows the same info
+        // icon + version) and the logo does not jump on upgrade.
+        $headerBootVersion = @parse_ini_file('/etc/unraid-version')['version'] ?? '';
+        // Shared Unraid wordmark path (same as the mounted HeaderLogo). Rendered
+        // with the gradient by default, or in currentColor when the theme-adaptive
+        // logo option is selected, matching the mounted logo.
+        $headerBootLogoPath = 'M146.7,29.47H135l-3,9h-6.49L138.93,0h8l13.41,38.49h-7.09L142.62,6.93l-5.83,16.88h8ZM29.69,0V25.4c0,8.91-5.77,13.64-14.9,13.64S0,34.31,0,25.4V0H6.54V25.4c0,5.17,3.19,7.92,8.25,7.92s8.36-2.75,8.36-7.92V0ZM50.86,12v26.5H44.31V0h6.11l17,26.5V0H74V38.49H67.9ZM171.29,0h6.54V38.49h-6.54Zm51.07,24.69c0,9-5.88,13.8-15.17,13.8H192.67V0H207.3c9.18,0,15.06,4.78,15.06,13.8ZM215.82,13.8c0-5.28-3.3-8.14-8.52-8.14h-8.08V32.77h8c5.33,0,8.63-2.8,8.63-8.08ZM108.31,23.92c4.34-1.6,6.93-5.28,6.93-11.55C115.24,3.68,110.18,0,102.48,0H88.84V38.49h6.55V5.66h6.87c3.8,0,6.21,1.82,6.21,6.71s-2.41,6.76-6.21,6.76H98.88l9.21,19.36h7.53Z';
     ?>
     <style>
-        /* Light-DOM fallback: paint the logo before <unraid-header> mounts so the
-           header does not pop in on page load. #header is already
-           display:flex; align-items:center, so the logo lands left + vertically
-           centered where the mounted logo sits. The mount engine calls
-           replaceChildren(), so this markup is discarded when the component
-           upgrades. */
+        /* Light-DOM fallback: paint the logo + version before <unraid-header>
+           mounts so the header does not pop in on page load. The mount engine
+           calls replaceChildren(), so this markup is discarded on upgrade. To
+           avoid a position jump, the boot logo/version are pinned to where the
+           mounted logo/version land (measured). Values are in px, not rem,
+           because the webgui light DOM roots at 62.5% (1rem = 10px) while the
+           mounted component's `.unapi` scope roots at 16px, so rem here would
+           render half-size. `padding-top` top-anchors the logo at the mounted
+           offset (the logo left inset is shared with #UnraidHeader in
+           default-base.css). Only exists pre-mount, so this never affects the
+           mounted layout. */
         #header.unraid-consolidated-header .unraid-header-boot-logo {
-            display: inline-flex;
+            display: flex;
             flex-direction: column;
             align-items: flex-start;
-            justify-content: center;
-            gap: 0.8rem;
+            justify-content: flex-start;
+            gap: 13px; /* logo -> version visual gap (measured) */
+            height: 100%;
+            padding-top: 12px; /* desktop: mounted logo top offset */
         }
         #header.unraid-consolidated-header .unraid-header-boot-logo svg {
             display: block;
@@ -38,35 +53,43 @@
             max-height: 3rem;
             height: auto;
         }
-        /* Invisible stub that reproduces the mounted version pill so the boot
-           logo sits at the same top offset as the mounted logo+version group
-           instead of jumping up on mount. Only at sm+, where the mounted layout
-           groups them; below sm the mounted logo is centered, matching the
-           stub-less centered boot logo. */
+        /* Theme-adaptive logo: render the wordmark in the header text color like
+           the mounted HeaderLogo, instead of the gradient. */
+        #header.unraid-consolidated-header .unraid-header-boot-logo-theme {
+            color: var(--header-text-primary);
+        }
+        /* Boot version placeholder mirroring the mounted HeaderVersion (info icon
+           + version text) so the group height matches and there is no size flash.
+           px sizing matches the mounted text-xs / text-sm (12px / 14px). */
         #header.unraid-consolidated-header .unraid-header-boot-version {
-            display: none;
+            display: inline-flex;
+            align-items: center;
+            gap: 4px;
+            color: var(--header-text-secondary);
+            font-weight: 600;
+            line-height: 1;
+            font-size: 12px;
+            white-space: nowrap;
+        }
+        #header.unraid-consolidated-header .unraid-header-boot-version svg {
+            width: 12px;
+            height: 12px;
+            flex-shrink: 0;
         }
         @media (min-width: 30rem) {
             #header.unraid-consolidated-header .unraid-header-boot-logo svg {
                 width: 16rem;
             }
-        }
-        @media (min-width: 640px) {
             #header.unraid-consolidated-header .unraid-header-boot-version {
-                display: block;
-                height: 1.4rem;
+                font-size: 14px;
             }
         }
-        /* Below sm the mounted host is stretched and the logo is centered in the
-           space beneath the uptime strip. Fill the host and center the boot logo
-           with the same top offset so it lands where the mounted logo does
-           instead of pinning to the top. */
+        /* Below sm the mounted logo sits in the middle grid band, pushed down by
+           the full-width uptime/registration strip, so top-anchor it lower to
+           match the mounted logo offset there (measured). */
         @media (max-width: 639.98px) {
             #header.unraid-consolidated-header .unraid-header-boot-logo {
-                height: 100%;
-                box-sizing: border-box;
-                justify-content: center;
-                padding-top: 2rem;
+                padding-top: 28px;
             }
         }
     </style>
@@ -74,5 +97,5 @@
         server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
         show-array-usage="<?= $headerShowArrayUsage ?>"
         header-logo-style="<?= $headerLogoStyle ?>"
-    ><span class="unraid-header-boot-logo"><a href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 222.36 39.04" aria-hidden="true"><defs><linearGradient id="unraid-header-boot-logo-gradient" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path fill="url(#unraid-header-boot-logo-gradient)" d="M146.7,29.47H135l-3,9h-6.49L138.93,0h8l13.41,38.49h-7.09L142.62,6.93l-5.83,16.88h8ZM29.69,0V25.4c0,8.91-5.77,13.64-14.9,13.64S0,34.31,0,25.4V0H6.54V25.4c0,5.17,3.19,7.92,8.25,7.92s8.36-2.75,8.36-7.92V0ZM50.86,12v26.5H44.31V0h6.11l17,26.5V0H74V38.49H67.9ZM171.29,0h6.54V38.49h-6.54Zm51.07,24.69c0,9-5.88,13.8-15.17,13.8H192.67V0H207.3c9.18,0,15.06,4.78,15.06,13.8ZM215.82,13.8c0-5.28-3.3-8.14-8.52-8.14h-8.08V32.77h8c5.33,0,8.63-2.8,8.63-8.08ZM108.31,23.92c4.34-1.6,6.93-5.28,6.93-11.55C115.24,3.68,110.18,0,102.48,0H88.84V38.49h6.55V5.66h6.87c3.8,0,6.21,1.82,6.21,6.71s-2.41,6.76-6.21,6.76H98.88l9.21,19.36h7.53Z"/></svg></a><span class="unraid-header-boot-version" aria-hidden="true"></span></span></unraid-header>
+    ><span class="unraid-header-boot-logo"><a href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><?php if ($headerLogoStyle === 'theme'): ?><svg class="unraid-header-boot-logo-theme" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 222.36 39.04" aria-hidden="true"><path fill="currentColor" d="<?=$headerBootLogoPath?>"/></svg><?php else: ?><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 222.36 39.04" aria-hidden="true"><defs><linearGradient id="unraid-header-boot-logo-gradient" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path fill="url(#unraid-header-boot-logo-gradient)" d="<?=$headerBootLogoPath?>"/></svg><?php endif; ?></a><span class="unraid-header-boot-version" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm8.706-1.442c1.146-.573 2.437.463 2.126 1.706l-.709 2.836.042-.02a.75.75 0 0 1 .67 1.34l-.04.022c-1.147.573-2.438-.463-2.127-1.706l.71-2.836-.042.02a.75.75 0 1 1-.671-1.34l.041-.022ZM12 9a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Z" clip-rule="evenodd"/></svg><?= htmlspecialchars($headerBootVersion, ENT_QUOTES) ?></span></span></unraid-header>
 </div>
diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index f98e7a692a..9328a1d831 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -495,6 +495,18 @@ textarea:where(:not(.unapi *)) {
 
 #header.unraid-consolidated-header #UnraidHeader {
     min-height: inherit;
+}
+
+/* The light-DOM boot logo must occupy the same inset box as the mounted
+   #UnraidHeader so the logo does not jump when <unraid-header> upgrades.
+   #UnraidHeader carries the inset via its padding but only exists post-mount, so
+   the boot logo shares the same padding (here and in the desktop breakpoint
+   below) and is full-height + vertically centered (see Header.php). It only
+   exists pre-mount (replaceChildren discards it), so this never affects the
+   mounted layout. */
+#header.unraid-consolidated-header #UnraidHeader,
+#header.unraid-consolidated-header .unraid-header-boot-logo {
+    box-sizing: border-box;
     padding: .5rem 1rem;
 }
 
@@ -2441,7 +2453,8 @@ div#title.ud {
         padding-left: 0;
     }
 
-    #header.unraid-consolidated-header #UnraidHeader {
+    #header.unraid-consolidated-header #UnraidHeader,
+    #header.unraid-consolidated-header .unraid-header-boot-logo {
         padding-left: calc(64px + 1rem);
         padding-right: 1rem;
     }

From c7ae278b6018559b5234af1e6875772407bbd6ea Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Fri, 24 Jul 2026 17:27:06 -0400
Subject: [PATCH 07/10] fix(header): neutral placeholder color for boot version
 (no color flash)

The mounted version color (--header-text-secondary) is only defined in
the mounted .unapi scope, so var(--header-text-secondary) in the light
DOM fell back to the inherited near-black header text, then flashed to
gray on mount. Use a fixed neutral #999 placeholder: exact on white/black
themes, a gentle shift (vs #606e7f) on gray/azure, no dark->gray flash.
---
 .../plugins/dynamix/include/DefaultPageLayout/Header.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 5d188afb8a..479be83aef 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -65,7 +65,12 @@
             display: inline-flex;
             align-items: center;
             gap: 4px;
-            color: var(--header-text-secondary);
+            /* Neutral placeholder gray. The real per-theme secondary color
+               (--header-text-secondary: #999 on white/black, #606e7f on
+               gray/azure) only exists in the mounted .unapi scope, so a fixed
+               mid-gray reads fine on both light and dark header backgrounds and
+               makes the swap-in a gentle shift instead of a dark->gray flash. */
+            color: #999;
             font-weight: 600;
             line-height: 1;
             font-size: 12px;

From a6bfaca931c98129cda10fbe9ebec5f0ee826016 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Fri, 24 Jul 2026 17:46:05 -0400
Subject: [PATCH 08/10] fix(header): size boot SVGs via attributes to stop
 pre-CSS reflow

The boot version info-icon and logo SVGs had a viewBox but no width/height
attributes, so before the inline <style> applied they rendered at the SVG
default (~300px), shoving the version text far right, then snapping left
once CSS sized them (the 'spaced out, flashes right-to-left' FOUC). Add
explicit width/height attributes so the SVGs are correctly sized from the
first paint, independent of CSS timing.
---
 emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 479be83aef..7aca6abaa2 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -102,5 +102,5 @@
         server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
         show-array-usage="<?= $headerShowArrayUsage ?>"
         header-logo-style="<?= $headerLogoStyle ?>"
-    ><span class="unraid-header-boot-logo"><a href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><?php if ($headerLogoStyle === 'theme'): ?><svg class="unraid-header-boot-logo-theme" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 222.36 39.04" aria-hidden="true"><path fill="currentColor" d="<?=$headerBootLogoPath?>"/></svg><?php else: ?><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 222.36 39.04" aria-hidden="true"><defs><linearGradient id="unraid-header-boot-logo-gradient" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path fill="url(#unraid-header-boot-logo-gradient)" d="<?=$headerBootLogoPath?>"/></svg><?php endif; ?></a><span class="unraid-header-boot-version" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm8.706-1.442c1.146-.573 2.437.463 2.126 1.706l-.709 2.836.042-.02a.75.75 0 0 1 .67 1.34l-.04.022c-1.147.573-2.438-.463-2.127-1.706l.71-2.836-.042.02a.75.75 0 1 1-.671-1.34l.041-.022ZM12 9a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Z" clip-rule="evenodd"/></svg><?= htmlspecialchars($headerBootVersion, ENT_QUOTES) ?></span></span></unraid-header>
+    ><span class="unraid-header-boot-logo"><a href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><?php if ($headerLogoStyle === 'theme'): ?><svg class="unraid-header-boot-logo-theme" xmlns="http://www.w3.org/2000/svg" width="140" height="24.6" viewBox="0 0 222.36 39.04" aria-hidden="true"><path fill="currentColor" d="<?=$headerBootLogoPath?>"/></svg><?php else: ?><svg xmlns="http://www.w3.org/2000/svg" width="140" height="24.6" viewBox="0 0 222.36 39.04" aria-hidden="true"><defs><linearGradient id="unraid-header-boot-logo-gradient" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path fill="url(#unraid-header-boot-logo-gradient)" d="<?=$headerBootLogoPath?>"/></svg><?php endif; ?></a><span class="unraid-header-boot-version" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="currentColor"><path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm8.706-1.442c1.146-.573 2.437.463 2.126 1.706l-.709 2.836.042-.02a.75.75 0 0 1 .67 1.34l-.04.022c-1.147.573-2.438-.463-2.127-1.706l.71-2.836-.042.02a.75.75 0 1 1-.671-1.34l.041-.022ZM12 9a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Z" clip-rule="evenodd"/></svg><?= htmlspecialchars($headerBootVersion, ENT_QUOTES) ?></span></span></unraid-header>
 </div>

From 020b7540301f2f34c41f9fc9e6a487aa81526efb Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Fri, 24 Jul 2026 20:09:00 -0400
Subject: [PATCH 09/10] fix(header): inline boot layout styles to kill
 first-paint reflow

Even with the boot CSS in an inline <style>, the version could paint for
one frame in inline flow (to the right of the logo) before the stylesheet
applied, then snap left once the flex-column layout kicked in. Move the
critical layout (flex column, left-aligned, gap, neutral color) to inline
style attributes on the boot markup so it is correct from the first
painted frame, independent of stylesheet timing. Responsive bits
(padding-top, logo width, font-size) stay in the <style> block.
---
 emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 7aca6abaa2..3d60aa56fe 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -102,5 +102,5 @@
         server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
         show-array-usage="<?= $headerShowArrayUsage ?>"
         header-logo-style="<?= $headerLogoStyle ?>"
-    ><span class="unraid-header-boot-logo"><a href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><?php if ($headerLogoStyle === 'theme'): ?><svg class="unraid-header-boot-logo-theme" xmlns="http://www.w3.org/2000/svg" width="140" height="24.6" viewBox="0 0 222.36 39.04" aria-hidden="true"><path fill="currentColor" d="<?=$headerBootLogoPath?>"/></svg><?php else: ?><svg xmlns="http://www.w3.org/2000/svg" width="140" height="24.6" viewBox="0 0 222.36 39.04" aria-hidden="true"><defs><linearGradient id="unraid-header-boot-logo-gradient" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path fill="url(#unraid-header-boot-logo-gradient)" d="<?=$headerBootLogoPath?>"/></svg><?php endif; ?></a><span class="unraid-header-boot-version" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="currentColor"><path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm8.706-1.442c1.146-.573 2.437.463 2.126 1.706l-.709 2.836.042-.02a.75.75 0 0 1 .67 1.34l-.04.022c-1.147.573-2.438-.463-2.127-1.706l.71-2.836-.042.02a.75.75 0 1 1-.671-1.34l.041-.022ZM12 9a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Z" clip-rule="evenodd"/></svg><?= htmlspecialchars($headerBootVersion, ENT_QUOTES) ?></span></span></unraid-header>
+    ><span class="unraid-header-boot-logo" style="display:flex;flex-direction:column;align-items:flex-start;gap:13px;height:100%;text-align:left"><a href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><?php if ($headerLogoStyle === 'theme'): ?><svg class="unraid-header-boot-logo-theme" xmlns="http://www.w3.org/2000/svg" width="140" height="24.6" viewBox="0 0 222.36 39.04" aria-hidden="true"><path fill="currentColor" d="<?=$headerBootLogoPath?>"/></svg><?php else: ?><svg xmlns="http://www.w3.org/2000/svg" width="140" height="24.6" viewBox="0 0 222.36 39.04" aria-hidden="true"><defs><linearGradient id="unraid-header-boot-logo-gradient" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path fill="url(#unraid-header-boot-logo-gradient)" d="<?=$headerBootLogoPath?>"/></svg><?php endif; ?></a><span class="unraid-header-boot-version" aria-hidden="true" style="display:inline-flex;align-items:center;gap:4px;color:#999;font-weight:600;line-height:1;white-space:nowrap"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="currentColor"><path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm8.706-1.442c1.146-.573 2.437.463 2.126 1.706l-.709 2.836.042-.02a.75.75 0 0 1 .67 1.34l-.04.022c-1.147.573-2.438-.463-2.127-1.706l.71-2.836-.042.02a.75.75 0 1 1-.671-1.34l.041-.022ZM12 9a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Z" clip-rule="evenodd"/></svg><?= htmlspecialchars($headerBootVersion, ENT_QUOTES) ?></span></span></unraid-header>
 </div>

From f9ed842fc48f5f0e3af0b7ebbe293f32b6f29a62 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Fri, 24 Jul 2026 20:24:07 -0400
Subject: [PATCH 10/10] fix(header): scope boot logo sizing so it doesn't
 stretch the version icon

The boot logo svg rules used a descendant selector
(.unraid-header-boot-logo svg) that also matched the version info icon
below it. Same specificity, later source order, so the logo width
(16rem/160px) overrode the icon's 12px, stretching it to 160x12 and
shoving the version number to the right (the 'spaced out, right-to-left'
flash). Scope the logo rules to the logo link (.unraid-header-boot-logo a
svg) so they never touch the version icon.

Diagnosed by measuring the frozen boot placeholder: version icon computed
width was 160px.
---
 .../plugins/dynamix/include/DefaultPageLayout/Header.php   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 3d60aa56fe..d254919aec 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -46,7 +46,10 @@
             height: 100%;
             padding-top: 12px; /* desktop: mounted logo top offset */
         }
-        #header.unraid-consolidated-header .unraid-header-boot-logo svg {
+        /* Scope to the logo link's svg only — a bare `.unraid-header-boot-logo svg`
+           descendant selector also matches the version info icon below and would
+           stretch it to the logo width. */
+        #header.unraid-consolidated-header .unraid-header-boot-logo a svg {
             display: block;
             width: 14rem;
             max-width: 100%;
@@ -82,7 +85,7 @@
             flex-shrink: 0;
         }
         @media (min-width: 30rem) {
-            #header.unraid-consolidated-header .unraid-header-boot-logo svg {
+            #header.unraid-consolidated-header .unraid-header-boot-logo a svg {
                 width: 16rem;
             }
             #header.unraid-consolidated-header .unraid-header-boot-version {