Skip to content

honor the dark = light + dark stylesheet convention #12514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

honor the dark = light + dark stylesheet convention #12514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions src/command/render/pandoc-html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export async function resolveSassBundles(
)
? "dark"
: "light";
const targets: SassTarget[] = [{
let targets: SassTarget[] = [{
name: `${dependency}.min.css`,
bundles: (bundles as any),
attribs: {
Expand Down Expand Up @@ -175,10 +175,22 @@ export async function resolveSassBundles(
...attribForThemeStyle("dark"),
},
};
if (defaultStyle === "dark") {
if (defaultStyle === "dark") { // light, dark
targets.push(darkTarget);
} else {
targets.unshift(darkTarget);
} else { // light, dark, light
const lightTargetExtra = {
...targets[0],
attribs: {
...targets[0].attribs,
class: "quarto-color-scheme-extra",
},
};

targets = [
targets[0],
darkTarget,
lightTargetExtra,
];
}

hasDarkStyles = true;
Expand Down
6 changes: 5 additions & 1 deletion src/resources/formats/html/templates/quarto-html-before-body.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
const alternateStylesheets = window.document.querySelectorAll('link.quarto-color-scheme.quarto-color-alternate');
manageTransitions('#quarto-margin-sidebar .nav-link', false);
if (alternate) {
disableStylesheet(primaryStylesheets)
// note: dark is layered on light, we don't disable primary!
enableStylesheet(alternateStylesheets);
for (const sheetNode of alternateStylesheets) {
if (sheetNode.id === "quarto-bootstrap") {
Expand Down Expand Up @@ -170,6 +170,10 @@
<% } else { %>
const darkModeDefault = <%= darkModeDefault %>;
<% } %>

<% if (!darkModeDefault) { %>
document.querySelector('link.quarto-color-scheme-extra').rel = 'disabled-stylesheet';
<% } %>

let localAlternateSentinel = darkModeDefault ? 'alternate' : 'default';

Expand Down
Loading