From a0bb017467f9cf84ea20cb74c831455991a6241a Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Mon, 28 Oct 2024 15:55:48 +0100
Subject: [PATCH 1/2] site: move theme switch to footer

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 hugo_stats.json              |  3 ++-
 layouts/partials/footer.html | 25 ++++++++++++++++++++++++-
 layouts/partials/header.html |  9 ---------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/hugo_stats.json b/hugo_stats.json
index 6e834ec746..2b84aceb2c 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -41,6 +41,7 @@
       "Docker-Compose",
       "Docker-Desktop",
       "Docker-Hub",
+      "Docker-Scout-Dashboard",
       "Download",
       "Editor-or-IDE",
       "Entra-ID",
@@ -86,6 +87,7 @@
       "Node",
       "Non-compliant",
       "Okta",
+      "Okta-SAML",
       "Old-Dockerfile",
       "PHP",
       "PowerShell",
@@ -479,7 +481,6 @@
       "space-y-4",
       "sticky",
       "svg-container",
-      "svg-icon",
       "syntax-light",
       "systemd-networkd",
       "text-2xl",
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 575f88242b..7591a1738f 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -62,10 +62,33 @@
           >Legal</a>
       </div>
     </div>
-    <div>
+    <div class="flex justify-between items-center">
       <button type="button" id="ot-sdk-btn" class="ot-sdk-show-settings">
         Cookies Settings
       </button>
+      <div class="flex items-center gap-2">
+        <span>Theme:</span>
+        <button
+          aria-label="Theme switch"
+          id="theme-switch"
+          class="rounded bg-blue-light px-4 py-1 text-white transition
+          hover:bg-blue-light-400 dark:bg-blue-dark-400
+          dark:hover:bg-blue-dark"
+          x-data="{ theme: localStorage.getItem('theme-preference') }"
+          x-init="$watch('theme', value => {
+                localStorage.setItem('theme-preference', value);
+                document.firstElementChild.className = value;
+              })"
+          @click="theme = (theme === 'dark' ? 'light' : 'dark')"
+        >
+          <span class="icon-svg icon-sm dark:hidden"
+            >Light {{ partialCached "icon" "light_mode" "light_mode" }}</span
+          >
+          <span class="icon-svg icon-sm hidden dark:block"
+            >Dark {{ partialCached "icon" "dark_mode" "dark_mode" }}</span
+          >
+        </button>
+      </div>
     </div>
   </div>
 </div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 3d8e1bec53..fa19c18ca1 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -37,15 +37,6 @@
         <span>Ask&nbsp;AI</span>
         <img src="{{ (resources.Get "images/ai-stars.svg").Permalink }}" alt="AI Stars" />
       </button>
-      <button aria-label="Theme switch" id="theme-switch" class="svg-icon"
-        x-data="{ theme: localStorage.getItem('theme-preference') }" x-init="$watch('theme', value => {
-        localStorage.setItem('theme-preference', value);
-        document.firstElementChild.className = value;
-      })" @click="theme = (theme === 'dark' ? 'light' : 'dark')">
-        <span class="icon-svg dark:hidden">{{ partialCached "icon" "light_mode" "light_mode"}}</span>
-        <span class="icon-svg hidden dark:block">{{ partialCached "icon" "dark_mode" "dark_mode"}}</span>
-      </button>
     </div>
   </div>
-
 </header>

From 93f816efbb5b149604b0792572942bccd21ab80c Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Mon, 28 Oct 2024 16:04:40 +0100
Subject: [PATCH 2/2] site: use condensed header logo on small screens

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 assets/images/docker-docs-white-condensed.svg | 4 ++++
 hugo_stats.json                               | 1 +
 layouts/partials/header.html                  | 5 ++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 assets/images/docker-docs-white-condensed.svg

diff --git a/assets/images/docker-docs-white-condensed.svg b/assets/images/docker-docs-white-condensed.svg
new file mode 100644
index 0000000000..db5206c25d
--- /dev/null
+++ b/assets/images/docker-docs-white-condensed.svg
@@ -0,0 +1,4 @@
+<svg width="84" height="25" viewBox="0 0 84 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.6087 10.9342C23.0202 10.5373 21.4744 10.3676 20.3501 10.6711C20.2896 9.5489 19.7119 8.60334 18.656 7.77841L18.2647 7.51537L18.0038 7.90993C17.4914 8.68895 17.2763 9.72711 17.3524 10.6711C17.413 11.2525 17.6148 11.9062 18.0038 12.3809C16.5411 13.2315 15.1925 13.0385 9.22035 13.0385H0.00209363C-0.0250805 14.3903 0.192313 16.9904 1.8414 19.1064C2.02385 19.3399 2.22339 19.5663 2.44001 19.7843C3.78086 21.1306 5.80727 22.1174 8.83758 22.1205C13.4603 22.1244 17.4207 19.62 19.8299 13.5646C20.6226 13.5778 22.715 13.707 23.7391 11.7233C23.764 11.6898 24 11.1972 24 11.1972L23.6087 10.9342ZM6.01846 9.53956H3.42604V12.1381H6.01846V9.53956ZM9.36787 9.53956H6.77545V12.1381H9.36787V9.53956ZM12.7173 9.53956H10.1249V12.1381H12.7173V9.53956ZM16.0667 9.53956H13.4743V12.1381H16.0667V9.53956ZM2.66827 9.53956H0.0766285V12.1381H2.66905L2.66827 9.53956ZM6.01768 6.25696H3.42526V8.85549H6.01768V6.25696ZM9.36709 6.25696H6.77468V8.85549H9.36709V6.25696ZM12.7165 6.25696H10.1241V8.85549H12.7165V6.25696ZM12.7165 2.97437H10.1241V5.57289H12.7165V2.97437Z" fill="white"/>
+<path d="M36.774 21.6394C35.578 21.6394 34.497 21.3634 33.531 20.8114C32.5803 20.244 31.8213 19.4774 31.254 18.5114C30.702 17.5454 30.426 16.4567 30.426 15.2454C30.426 14.034 30.679 12.953 31.185 12.0024C31.7063 11.0364 32.4117 10.2774 33.301 9.72536C34.1903 9.15803 35.1947 8.87436 36.314 8.87436C37.2187 8.87436 38.0543 9.06603 38.821 9.44936C39.5877 9.81736 40.2317 10.3234 40.753 10.9674V4.75736C40.753 4.4047 40.8603 4.12103 41.075 3.90636C41.305 3.6917 41.5887 3.58436 41.926 3.58436C42.2787 3.58436 42.5623 3.6917 42.777 3.90636C42.9917 4.12103 43.099 4.4047 43.099 4.75736V15.2454C43.099 16.4567 42.8153 17.5454 42.248 18.5114C41.696 19.4774 40.9447 20.244 39.994 20.8114C39.0433 21.3634 37.97 21.6394 36.774 21.6394ZM36.774 19.5694C37.556 19.5694 38.2537 19.3854 38.867 19.0174C39.4803 18.634 39.9633 18.1127 40.316 17.4534C40.6687 16.794 40.845 16.058 40.845 15.2454C40.845 14.4174 40.6687 13.6814 40.316 13.0374C39.9633 12.3934 39.4803 11.8874 38.867 11.5194C38.2537 11.136 37.556 10.9444 36.774 10.9444C36.0073 10.9444 35.3097 11.136 34.681 11.5194C34.0677 11.8874 33.577 12.3934 33.209 13.0374C32.8563 13.6814 32.68 14.4174 32.68 15.2454C32.68 16.058 32.8563 16.794 33.209 17.4534C33.577 18.1127 34.0677 18.634 34.681 19.0174C35.3097 19.3854 36.0073 19.5694 36.774 19.5694ZM51.9459 21.6394C50.7039 21.6394 49.6075 21.371 48.6569 20.8344C47.7062 20.2824 46.9549 19.531 46.4029 18.5804C45.8662 17.6144 45.5979 16.5104 45.5979 15.2684C45.5979 14.011 45.8662 12.907 46.4029 11.9564C46.9549 10.9904 47.7062 10.239 48.6569 9.70236C49.6075 9.15036 50.7039 8.87436 51.9459 8.87436C53.1725 8.87436 54.2612 9.15036 55.2119 9.70236C56.1625 10.239 56.9062 10.9904 57.4429 11.9564C57.9949 12.907 58.2709 14.011 58.2709 15.2684C58.2709 16.5104 58.0025 17.6144 57.4659 18.5804C56.9292 19.531 56.1855 20.2824 55.2349 20.8344C54.2842 21.371 53.1879 21.6394 51.9459 21.6394ZM51.9459 19.5694C52.7432 19.5694 53.4485 19.3854 54.0619 19.0174C54.6752 18.6494 55.1505 18.1434 55.4879 17.4994C55.8405 16.8554 56.0169 16.1117 56.0169 15.2684C56.0169 14.425 55.8405 13.6814 55.4879 13.0374C55.1505 12.378 54.6752 11.8644 54.0619 11.4964C53.4485 11.1284 52.7432 10.9444 51.9459 10.9444C51.1485 10.9444 50.4432 11.1284 49.8299 11.4964C49.2165 11.8644 48.7335 12.378 48.3809 13.0374C48.0282 13.6814 47.8519 14.425 47.8519 15.2684C47.8519 16.1117 48.0282 16.8554 48.3809 17.4994C48.7335 18.1434 49.2165 18.6494 49.8299 19.0174C50.4432 19.3854 51.1485 19.5694 51.9459 19.5694ZM66.4664 21.6394C65.2397 21.6394 64.1434 21.3634 63.1774 20.8114C62.2267 20.244 61.4754 19.485 60.9234 18.5344C60.3867 17.5684 60.1184 16.4797 60.1184 15.2684C60.1184 14.0264 60.3867 12.9224 60.9234 11.9564C61.46 10.9904 62.196 10.239 63.1314 9.70236C64.0667 9.15036 65.14 8.87436 66.3514 8.87436C67.256 8.87436 68.084 9.0507 68.8354 9.40336C69.5867 9.7407 70.2614 10.2544 70.8594 10.9444C71.0741 11.1897 71.1507 11.4427 71.0894 11.7034C71.0281 11.964 70.8594 12.194 70.5834 12.3934C70.3687 12.5467 70.1311 12.6004 69.8704 12.5544C69.6097 12.493 69.372 12.355 69.1574 12.1404C68.406 11.343 67.4707 10.9444 66.3514 10.9444C65.5694 10.9444 64.8794 11.1284 64.2814 11.4964C63.6834 11.849 63.2157 12.3474 62.8784 12.9914C62.541 13.6354 62.3724 14.3944 62.3724 15.2684C62.3724 16.0964 62.541 16.8324 62.8784 17.4764C63.231 18.1204 63.714 18.634 64.3274 19.0174C64.9407 19.3854 65.6537 19.5694 66.4664 19.5694C67.0031 19.5694 67.4707 19.508 67.8694 19.3854C68.2834 19.2474 68.6591 19.0404 68.9964 18.7644C69.2417 18.565 69.4947 18.4577 69.7554 18.4424C70.0161 18.4117 70.2461 18.4807 70.4454 18.6494C70.706 18.864 70.8517 19.1094 70.8824 19.3854C70.913 19.646 70.821 19.8837 70.6064 20.0984C69.5024 21.1257 68.1224 21.6394 66.4664 21.6394ZM78.1529 21.6394C77.0795 21.6394 76.0829 21.4784 75.1629 21.1564C74.2582 20.819 73.5529 20.3974 73.0469 19.8914C72.8169 19.646 72.7172 19.37 72.7479 19.0634C72.7939 18.7414 72.9472 18.4807 73.2079 18.2814C73.5145 18.036 73.8135 17.9364 74.1049 17.9824C74.4115 18.013 74.6722 18.1434 74.8869 18.3734C75.1475 18.6647 75.5615 18.9407 76.1289 19.2014C76.7115 19.4467 77.3555 19.5694 78.0609 19.5694C78.9502 19.5694 79.6249 19.4237 80.0849 19.1324C80.5602 18.841 80.8055 18.4654 80.8209 18.0054C80.8362 17.5454 80.6139 17.1467 80.1539 16.8094C79.7092 16.472 78.8889 16.196 77.6929 15.9814C76.1442 15.6747 75.0172 15.2147 74.3119 14.6014C73.6219 13.988 73.2769 13.2367 73.2769 12.3474C73.2769 11.5654 73.5069 10.9214 73.9669 10.4154C74.4269 9.89403 75.0172 9.5107 75.7379 9.26536C76.4585 9.0047 77.2099 8.87436 77.9919 8.87436C79.0039 8.87436 79.9009 9.03536 80.6829 9.35736C81.4649 9.67936 82.0859 10.124 82.5459 10.6914C82.7605 10.9367 82.8602 11.1974 82.8449 11.4734C82.8295 11.734 82.6992 11.9564 82.4539 12.1404C82.2085 12.309 81.9172 12.3627 81.5799 12.3014C81.2425 12.24 80.9589 12.102 80.7289 11.8874C80.3455 11.5194 79.9315 11.2664 79.4869 11.1284C79.0422 10.9904 78.5285 10.9214 77.9459 10.9214C77.2712 10.9214 76.6962 11.0364 76.2209 11.2664C75.7609 11.4964 75.5309 11.8337 75.5309 12.2784C75.5309 12.5544 75.5999 12.8074 75.7379 13.0374C75.8912 13.252 76.1825 13.4514 76.6119 13.6354C77.0412 13.804 77.6699 13.9727 78.4979 14.1414C79.6479 14.3714 80.5525 14.6627 81.2119 15.0154C81.8865 15.368 82.3695 15.782 82.6609 16.2574C82.9522 16.7174 83.0979 17.254 83.0979 17.8674C83.0979 18.5727 82.9062 19.209 82.5229 19.7764C82.1549 20.3437 81.6029 20.796 80.8669 21.1334C80.1462 21.4707 79.2415 21.6394 78.1529 21.6394Z" fill="white"/>
+</svg>
diff --git a/hugo_stats.json b/hugo_stats.json
index 2b84aceb2c..e72886d318 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -471,6 +471,7 @@
       "self-start",
       "shadow",
       "shadow-lg",
+      "sm:block",
       "sm:flex",
       "sm:flex-row",
       "sm:hidden",
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index fa19c18ca1..dbe0283041 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -10,9 +10,12 @@
       <div>
         {{/* main logo */}}
         <a title="Docker Docs home page" href="{{ site.BaseURL }}">
-          <div>
+          <div class="hidden sm:block">
             {{- (resources.Get "images/docker-docs-white.svg").Content | safe.HTML -}}
           </div>
+          <div class="block sm:hidden">
+            {{- (resources.Get "images/docker-docs-white-condensed.svg").Content | safe.HTML -}}
+          </div>
         </a>
       </div>
       <nav class="mt-1 hidden md:block">