From c264205138aae8e2619f4475e56e4e5b348b52db Mon Sep 17 00:00:00 2001
From: Gordon Woodhull <gordon.woodhull@posit.co>
Date: Mon, 29 Sep 2025 16:50:27 -0400
Subject: [PATCH] do not return undefined colors when splitting brand

fixes #13369
---
 src/core/brand/brand.ts                       | 38 ++++++++++---------
 src/core/sass/brand.ts                        |  2 +-
 .../brand/color/background-light-only.qmd     | 21 ++++++++++
 .../brand/color/foreground-dark-only.qmd      | 21 ++++++++++
 .../brand/color/primary-dark-only.qmd         | 22 +++++++++++
 5 files changed, 86 insertions(+), 18 deletions(-)
 create mode 100644 tests/docs/smoke-all/brand/color/background-light-only.qmd
 create mode 100644 tests/docs/smoke-all/brand/color/foreground-dark-only.qmd
 create mode 100644 tests/docs/smoke-all/brand/color/primary-dark-only.qmd

diff --git a/src/core/brand/brand.ts b/src/core/brand/brand.ts
index 0f62d755cf..4ce1ba3b75 100644
--- a/src/core/brand/brand.ts
+++ b/src/core/brand/brand.ts
@@ -675,42 +675,44 @@ export function splitUnifiedBrand(
         ? typography.headings
         : {
           ...typography.headings,
-          color: headingsColor && headingsColor[mode],
+          ...(headingsColor?.[mode] && { color: headingsColor[mode] }),
         },
       monospace:
         !typography.monospace || typeof typography.monospace === "string"
           ? typography.monospace
           : {
             ...typography.monospace,
-            color: monospaceColor && monospaceColor[mode],
-            "background-color": monospaceBackgroundColor &&
-              monospaceBackgroundColor[mode],
+            ...(monospaceColor?.[mode] && { color: monospaceColor[mode] }),
+            ...(monospaceBackgroundColor?.[mode] &&
+              { "background-color": monospaceBackgroundColor[mode] }),
           },
       "monospace-inline": !typography["monospace-inline"] ||
           typeof typography["monospace-inline"] === "string"
         ? typography["monospace-inline"]
         : {
           ...typography["monospace-inline"],
-          color: monospaceInlineColor && monospaceInlineColor[mode],
-          "background-color": monospaceInlineBackgroundColor &&
-            monospaceInlineBackgroundColor[mode],
+          ...(monospaceInlineColor?.[mode] &&
+            { color: monospaceInlineColor[mode] }),
+          ...(monospaceInlineBackgroundColor?.[mode] &&
+            { "background-color": monospaceInlineBackgroundColor[mode] }),
         },
       "monospace-block": !typography["monospace-block"] ||
           typeof typography["monospace-block"] === "string"
         ? typography["monospace-block"]
         : {
           ...typography["monospace-block"],
-          color: monospaceBlockColor && monospaceBlockColor[mode],
-          "background-color": monospaceBlockBackgroundColor &&
-            monospaceBlockBackgroundColor[mode],
+          ...(monospaceBlockColor?.[mode] &&
+            { color: monospaceBlockColor[mode] }),
+          ...(monospaceBlockBackgroundColor?.[mode] &&
+            { "background-color": monospaceBlockBackgroundColor[mode] }),
         },
       link: !typography.link || typeof typography.link === "string"
         ? typography.link
         : {
           ...typography.link,
-          color: linkColor && linkColor[mode],
-          "background-color": linkBackgroundColor &&
-            linkBackgroundColor[mode],
+          ...(linkColor?.[mode] && { color: linkColor[mode] }),
+          ...(linkBackgroundColor?.[mode] &&
+            { "background-color": linkBackgroundColor[mode] }),
         },
     };
   const logos = unifiedBrand.logo && splitLogo(unifiedBrand.logo);
@@ -733,10 +735,12 @@ export function splitUnifiedBrand(
       if (!unifiedBrand.color[colorName]) {
         continue;
       }
-      ({
-        light: lightBrand.color![colorName],
-        dark: darkBrand.color![colorName],
-      } = splitColorLightDark(unifiedBrand.color![colorName]));
+      const { light, dark } = splitColorLightDark(
+        unifiedBrand.color[colorName],
+      );
+
+      if (light !== undefined) lightBrand.color![colorName] = light;
+      if (dark !== undefined) darkBrand.color![colorName] = dark;
     }
   }
   return {
diff --git a/src/core/sass/brand.ts b/src/core/sass/brand.ts
index 2d1f1c112e..85e872919c 100644
--- a/src/core/sass/brand.ts
+++ b/src/core/sass/brand.ts
@@ -165,7 +165,7 @@ const fileFontImportString = (brand: Brand, description: BrandFontFile) => {
     }
     parts.push(`@font-face {
     font-family: '${description.family}';
-    src: url('${join(pathPrefix, path).replace(/\\/g, '/')}');
+    src: url('${join(pathPrefix, path).replace(/\\/g, "/")}');
     font-weight: ${weight || "normal"};
     font-style: ${style || "normal"};
 }\n`);
diff --git a/tests/docs/smoke-all/brand/color/background-light-only.qmd b/tests/docs/smoke-all/brand/color/background-light-only.qmd
new file mode 100644
index 0000000000..5f891c9597
--- /dev/null
+++ b/tests/docs/smoke-all/brand/color/background-light-only.qmd
@@ -0,0 +1,21 @@
+---
+title: primary only
+brand:
+  color:
+    background:
+      light: '#f3f3f8'
+    foreground:
+      light: '#0f0412'
+      dark: '#f8f8f8'
+_quarto:
+  tests: 
+    html:
+      printsMessage:
+        level: WARN
+        regex: '"[a-z]*" is not a valid CSS color name'
+        negate: true
+---
+
+---
+
+Here is some text [with a link](https://example.com).
diff --git a/tests/docs/smoke-all/brand/color/foreground-dark-only.qmd b/tests/docs/smoke-all/brand/color/foreground-dark-only.qmd
new file mode 100644
index 0000000000..80cfa42d1d
--- /dev/null
+++ b/tests/docs/smoke-all/brand/color/foreground-dark-only.qmd
@@ -0,0 +1,21 @@
+---
+title: primary only
+brand:
+  color:
+    background:
+      light: '#f3f3f8'
+      dark: '#0f0412'
+    foreground:
+      dark: '#f8f8f8'
+_quarto:
+  tests: 
+    html:
+      printsMessage:
+        level: WARN
+        regex: '"[a-z]*" is not a valid CSS color name'
+        negate: true
+---
+
+---
+
+Here is some text [with a link](https://example.com).
diff --git a/tests/docs/smoke-all/brand/color/primary-dark-only.qmd b/tests/docs/smoke-all/brand/color/primary-dark-only.qmd
new file mode 100644
index 0000000000..8323f8e0dc
--- /dev/null
+++ b/tests/docs/smoke-all/brand/color/primary-dark-only.qmd
@@ -0,0 +1,22 @@
+---
+title: primary only
+brand:
+  color:
+    background:
+      light: '#f3f3f8'
+      dark: '#0f0412'
+    foreground:
+      light: '#113322'
+      dark: '#f8f8f8'
+    primary:
+      dark: '#20bbff'
+_quarto:
+  tests: 
+    html:
+      printsMessage:
+        level: WARN
+        regex: '"[a-z]*" is not a valid CSS color name'
+        negate: true
+---
+
+Here is some text [with a link](https://example.com).