From bdfdbfebe2ffb5a6531e2c94a73f7400dc8a3f7c Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 29 Sep 2026 15:25:58 -0500
Subject: [PATCH] Update LKS header logos to use black version for Harvest and
 Leaf themes

---
 .../api/settings/TemplateResourceHandler.java | 14 +++---
 core/webapp/_images/LK-noTAG-black.svg        | 45 +++++++++++++++++++
 core/webapp/_images/mobile-logo-black.svg     | 10 +++++
 3 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 core/webapp/_images/LK-noTAG-black.svg
 create mode 100644 core/webapp/_images/mobile-logo-black.svg

diff --git a/api/src/org/labkey/api/settings/TemplateResourceHandler.java b/api/src/org/labkey/api/settings/TemplateResourceHandler.java
index c6dbf19768b..cd1a2e925f2 100644
--- a/api/src/org/labkey/api/settings/TemplateResourceHandler.java
+++ b/api/src/org/labkey/api/settings/TemplateResourceHandler.java
@@ -33,9 +33,6 @@
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import static org.labkey.api.settings.Theme.Overcast;
-import static org.labkey.api.settings.Theme.Seattle;
-
 public enum TemplateResourceHandler
 {
     LOGO
@@ -49,7 +46,7 @@ protected String getResourceName()
         @Override
         protected String getDefaultLink(Container c)
         {
-            return "/_images/lk-noTAG-" + resolveLogoThemeName(c) + ".svg";
+            return "/_images/LK-noTAG-" + resolveLogoThemeName(c) + ".svg";
         }
 
         @Override
@@ -166,9 +163,12 @@ protected CacheableWriter getWriterForContainer(Container c) throws IOException,
 
     private static String resolveLogoThemeName(Container c)
     {
-        Theme theme = PageFlowUtil.resolveTheme(c);
-
-        return (Seattle == theme ? theme : Overcast).name().toLowerCase();
+        return switch (PageFlowUtil.resolveTheme(c))
+        {
+            case Seattle -> "seattle";
+            case Harvest, Leaf -> "black";
+            default -> "overcast";
+        };
     }
 
     private Calendar getExpiration()
diff --git a/core/webapp/_images/LK-noTAG-black.svg b/core/webapp/_images/LK-noTAG-black.svg
new file mode 100644
index 00000000000..7d65ff132ff
--- /dev/null
+++ b/core/webapp/_images/LK-noTAG-black.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" width="99px" height="30px" viewBox="0 0 295.1 89.3"
+	 style="enable-background:new 0 0 295.1 89.3;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#000000;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M99.1,24.7h7.7v30.1c0,2.9,1.8,2.8,3.4,2.8h13.7v7.1h-16.4c-4.4,0-8.3-1.6-8.3-7.8V24.7z"/>
+		<path class="st0" d="M126.9,54.6c0-4.2,2.3-8,8.5-8c0,0,8.5,0.1,8.5,0c0,0,0.1-1.8,0-1.9c0-3.1-1.4-3.6-3.9-3.6
+			c-2.5,0-9.8,0.5-12.2,0.6V37c3.8-1.5,7.8-1.9,13.2-1.9c6.3,0,10.5,2.1,10.5,9.3v20.3h-6l-1.6-3.2c-0.3,0.6-4.4,3.6-8.8,3.5
+			c-5.6-0.1-8.2-4-8.2-7.7V54.6z M137.3,58.9c3.2,0,6.7-2.2,6.7-2.2v-5.3l-7,0.5c-2,0.2-2.4,1.7-2.4,3v1.4
+			C134.6,58.6,135.9,58.9,137.3,58.9z"/>
+		<path class="st0" d="M156.1,21.8h7.6v15.3c2.7-1.2,6.4-1.9,8.8-1.9c8,0,9.5,6.1,9.5,15.1c0,8.8-2.3,14.7-9.5,14.7
+			c-3.4,0-7-1.8-8.8-3.3l-1.4,2.9h-6.3V21.8z M170.6,58.5c2.5,0,3.8-2,3.8-8.5c0-7.4-1.4-8.8-3.8-8.8c-2.6,0-4.8,0.3-6.8,1.1v14.4
+			C165.4,57.7,167.7,58.5,170.6,58.5z"/>
+		<path class="st0" d="M187.4,24.7h7.4v16.7h3.2l10.1-16.7h8.9l-12.2,20.1l12.2,20h-8.9L198,48.1h-3.2v16.5h-7.4V24.7z"/>
+		<path class="st0" d="M229.3,35.4c8.4,0,12.3,1,12.3,10.6c0,5.2-2.8,7.3-8.1,7.3h-9.2c0,5.2,2,5.6,6.1,5.6c4.4,0,6.6,0,10.7-0.6
+			v5.2C237,65,230.8,65,226.2,65c-7.4,0-9.6-4.3-9.6-14.9C216.7,37.6,220.1,35.4,229.3,35.4z M231.6,47.8c1.6,0,2.4-0.8,2.4-2.2
+			c0-3.7-0.5-4.3-4.2-4.3c-4,0-5.5,0.2-5.5,6.5H231.6z"/>
+		<path class="st0" d="M251.7,35.6l5,20.3c0.6,2.3,2.5,2.1,2.9,2.1l5.8-22.5h8l-10.1,38.2l-4,5.6h-5.5l4.1-14.8c-4,0-7.2-2-8.6-7.4
+			l-5.7-21.6H251.7z"/>
+	</g>
+</g>
+<g>
+	<path class="st0" d="M45.2,9.8c-19.4,0-35.1,15.7-35.1,35.1c0,10.5,4.6,19.9,11.9,26.4l13.6-37.7V23.5c-1.5-0.7-2.6-2.3-2.6-4
+		s1.1-3.8,3.3-4l8.9,0l8.9,0c2.2,0.2,3.3,2.3,3.3,4s-1,3.3-2.6,4v10.1l13.6,37.7c7.3-6.4,11.9-15.9,11.9-26.4
+		C80.4,25.5,64.6,9.8,45.2,9.8z"/>
+	<path class="st0" d="M39,39L26.7,73.7c5.2,3.3,11.8,5.5,18.5,5.5s13.3-2.3,18.5-5.5L53.1,43L39,39z"/>
+</g>
+<g>
+	<path class="st0" d="M280.6,34.7c0.8,0,1.6,0.2,2.4,0.6c0.8,0.4,1.4,1,1.8,1.8c0.4,0.8,0.6,1.6,0.6,2.4c0,0.8-0.2,1.6-0.6,2.4
+		c-0.4,0.8-1,1.4-1.8,1.8c-0.8,0.4-1.6,0.6-2.4,0.6c-0.8,0-1.6-0.2-2.4-0.6c-0.8-0.4-1.4-1-1.8-1.8c-0.4-0.8-0.6-1.6-0.6-2.4
+		c0-0.8,0.2-1.6,0.6-2.4c0.4-0.8,1-1.4,1.8-1.8C279,34.9,279.8,34.7,280.6,34.7z M280.6,35.7c-0.7,0-1.3,0.2-1.9,0.5
+		c-0.6,0.3-1.1,0.8-1.4,1.4c-0.4,0.6-0.5,1.3-0.5,1.9c0,0.7,0.2,1.3,0.5,1.9c0.3,0.6,0.8,1.1,1.4,1.4c0.6,0.3,1.3,0.5,1.9,0.5
+		c0.7,0,1.3-0.2,1.9-0.5c0.6-0.3,1.1-0.8,1.4-1.4c0.3-0.6,0.5-1.3,0.5-1.9c0-0.7-0.2-1.3-0.5-1.9c-0.4-0.6-0.8-1.1-1.4-1.4
+		C281.9,35.9,281.3,35.7,280.6,35.7z M278.5,42.1V37h1c1,0,1.5,0,1.6,0c0.3,0,0.6,0.1,0.8,0.2c0.2,0.1,0.3,0.3,0.5,0.5
+		c0.1,0.2,0.2,0.5,0.2,0.7c0,0.4-0.1,0.7-0.4,0.9c-0.2,0.3-0.6,0.4-1,0.5c0.2,0.1,0.3,0.1,0.4,0.2c0.1,0.1,0.2,0.2,0.3,0.4
+		c0,0.1,0.2,0.3,0.4,0.6l0.6,1h-1.3l-0.4-0.8c-0.3-0.6-0.5-0.9-0.7-1.1s-0.4-0.2-0.7-0.2h-0.3v2.1H278.5z M279.5,39.2h0.4
+		c0.6,0,1,0,1.1-0.1s0.3-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.1-0.4c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.2c-0.2,0-0.5-0.1-1.1-0.1
+		h-0.4V39.2z"/>
+</g>
+</svg>
diff --git a/core/webapp/_images/mobile-logo-black.svg b/core/webapp/_images/mobile-logo-black.svg
new file mode 100644
index 00000000000..6041f79a447
--- /dev/null
+++ b/core/webapp/_images/mobile-logo-black.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="30px" height="30px" viewBox="9.6 9.3 71.2 71.2">
+<style type="text/css">.st0{fill:#000000;}</style>
+<g>
+	<path class="st0" d="M45.2,9.8c-19.4,0-35.1,15.7-35.1,35.1c0,10.5,4.6,19.9,11.9,26.4l13.6-37.7V23.5c-1.5-0.7-2.6-2.3-2.6-4
+		s1.1-3.8,3.3-4l8.9,0l8.9,0c2.2,0.2,3.3,2.3,3.3,4s-1,3.3-2.6,4v10.1l13.6,37.7c7.3-6.4,11.9-15.9,11.9-26.4
+		C80.4,25.5,64.6,9.8,45.2,9.8z"/>
+	<path class="st0" d="M39,39L26.7,73.7c5.2,3.3,11.8,5.5,18.5,5.5s13.3-2.3,18.5-5.5L53.1,43L39,39z"/>
+</g>
+</svg>