Skip to content

SCSS, brand: forward background color from monospace to -block and -inline #11261

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 4 commits into from
Oct 31, 2024
Merged

SCSS, brand: forward background color from monospace to -block and -inline #11261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf4e16b
fix explainer tool
cscheid Oct 31, 2024
6ff9fe5
forward background color from monospace to -block and -inline
cscheid Oct 31, 2024
50442b3
merge
cscheid Oct 31, 2024
ac34337
Merge branch 'main' into bugfix/11255
cscheid Oct 31, 2024
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
26 changes: 19 additions & 7 deletions src/core/sass/brand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ const brandColorBundle = (
);
colorCssVariables.push(
` --brand-${colorVar}: ${brand.getColor(colorKey)};`,
)
);
}

// Map theme colors directly to Sass variables
Expand All @@ -222,7 +222,10 @@ const brandColorBundle = (
}
// const colorEntries = Object.keys(brand.color);
colorVariables.push('// quarto-scss-analysis-annotation { "action": "pop" }');
colorCssVariables.push("}", '// quarto-scss-analysis-annotation { "action": "pop" }');
colorCssVariables.push(
"}",
'// quarto-scss-analysis-annotation { "action": "pop" }',
);
const colorBundle: SassBundleLayers = {
key,
// dependency: "bootstrap",
Expand All @@ -239,13 +242,13 @@ const brandColorBundle = (

const brandBootstrapBundle = (
brand: Brand,
key: string
key: string,
): SassBundleLayers => {
// Bootstrap Variables from brand.defaults.bootstrap
const brandBootstrap = (brand?.data?.defaults?.bootstrap as unknown as Record<
const brandBootstrap = brand?.data?.defaults?.bootstrap as unknown as Record<
string,
Record<string, string | boolean | number | null>
>);
>;

const bsVariables: string[] = [
"/* Bootstrap variables from _brand.yml */",
Expand Down Expand Up @@ -276,7 +279,7 @@ const brandBootstrapBundle = (
"green",
"teal",
"cyan",
]
];

const bsColors: string[] = [
"/* Bootstrap color variables from _brand.yml */",
Expand Down Expand Up @@ -459,6 +462,10 @@ const brandTypographyBundle = (
// revealjs
["size", "code-block-font-size"],
["color", "code-block-color"],

// monospace forwards to both block and inline
["background-color", "code-bg"],
["background-color", "code-block-bg"],
],
"monospace-block": [
// bootstrap + revealjs
Expand Down Expand Up @@ -566,7 +573,12 @@ export async function brandBootstrapSassBundleLayers(
nameMap: Record<string, string> = {},
): Promise<SassBundleLayers[]> {
const brand = await project.resolveBrand(fileName);
const sassBundles = await brandSassBundleLayers(fileName, project, key, nameMap);
const sassBundles = await brandSassBundleLayers(
fileName,
project,
key,
nameMap,
);

if (brand?.data?.defaults?.bootstrap) {
const bsBundle = brandBootstrapBundle(brand, key);
Expand Down
2 changes: 1 addition & 1 deletion tools/sass-variable-explainer/parse-web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ import { parse } from 'https://cdn.skypack.dev/scss-parser/';
// import * as prettier from "https://esm.sh/[email protected]"; // skypack crashes with prettier
import { makeParserModule } from "./parse.ts";

export const getSassAst = makeParserModule(parse, (s: string) => s).getSassAst;
export const getSassAst = makeParserModule(parse).getSassAst;
Loading