Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/command/render/pandoc-html.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ export async function resolveSassBundles(
}
return bundle as SassBundle;
});
if (!foundBrand.light || !foundBrand.dark) {
if (maybeBrandBundle && (!foundBrand.light || !foundBrand.dark)) {
bundles.unshift({
dependency,
key: "brand",
user: !foundBrand.light && maybeBrandBundle?.user as SassLayer[] || [],
dark: !foundBrand.dark && maybeBrandBundle?.dark?.user && {
user: !foundBrand.light && maybeBrandBundle.user as SassLayer[] || [],
dark: !foundBrand.dark && maybeBrandBundle.dark?.user && {
user: maybeBrandBundle.dark.user as SassLayer[],
default: maybeBrandBundle.dark.default,
} || undefined,
Expand Down
22 changes: 12 additions & 10 deletions src/core/sass/brand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -582,14 +582,16 @@ export async function brandSassLayers(
dark: []
};

for (const layer of [sassLayers.light, sassLayers.dark]) {
layer.push({
defaults: '$theme: "brand" !default;',
uses: "",
functions: "",
mixins: "",
rules: "",
});
for (const mode of ["light", "dark"] as Array<"dark" | "light">) {
if (brand && brand[mode]) {
sassLayers[mode].push({
defaults: '$theme: "brand" !default;',
uses: "",
functions: "",
mixins: "",
rules: "",
});
}
}
if (brand?.light?.data.color) {
sassLayers.light.push(brandColorLayer(brand?.light, nameMap));
Expand Down Expand Up @@ -658,10 +660,10 @@ export async function brandSassFormatExtras(
key: "brand",
dependency: "bootstrap",
user: htmlSassBundleLayers.light,
dark: {
dark: htmlSassBundleLayers.dark.length ? {
user: htmlSassBundleLayers.dark,
default: darkModeDefault(format.metadata)
}
} : undefined
},
],
},
Expand Down
8 changes: 4 additions & 4 deletions src/project/project-shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -602,18 +602,18 @@ export async function projectResolveBrand(
let light, dark;
if (typeof brand.light === "string") {
light = await loadRelativeBrand(brand.light);
} else {
} else if (brand.light) {
light = new Brand(
brand.light!,
brand.light,
dirname(fileName),
project.dir,
);
}
if (typeof brand.dark === "string") {
dark = await loadRelativeBrand(brand.dark);
} else {
} else if(brand.dark) {
dark = new Brand(
brand.dark!,
brand.dark,
dirname(fileName),
project.dir,
);
Expand Down
17 changes: 17 additions & 0 deletions tests/docs/smoke-all/dark-mode/light-brand.qmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
format: html
brand:
light: united-brand.yml
_quarto:
tests:
html:
ensureHtmlElements:
- []
- ["link[href*=\"-dark-\"]"]
---

## Hello

```markdown
![asdf](asd.png)
```
17 changes: 17 additions & 0 deletions tests/docs/smoke-all/dark-mode/light-theme.qmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
format: html
theme:
light: united
_quarto:
tests:
html:
ensureHtmlElements:
- []
- ["link[href*=\"-dark-\"]"]
---

## Hello

```markdown
![asdf](asd.png)
```
15 changes: 15 additions & 0 deletions tests/docs/smoke-all/dark-mode/no-brand.qmd
Comment thread
cderv marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
format: html
_quarto:
tests:
html:
ensureHtmlElements:
- []
- ["link[href*=\"-dark-\"]"]
---

## Hello

```markdown
![asdf](asd.png)
```
Loading