Skip to content

fix(brand): Fix and improve Bootstrap variable handling #11168

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 3 commits into from
Oct 23, 2024
Merged

fix(brand): Fix and improve Bootstrap variable handling #11168

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dad476
fix(brand): Replace all invalid chars in brand sass/css vars
gadenbuie Oct 23, 2024
cbf1759
fix(brand): Drop "gray" and "gray-dark" from Bootstrap color vars
gadenbuie Oct 23, 2024
1c7709d
refactor(brand): Remove Bootstrap version check
gadenbuie Oct 23, 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
37 changes: 16 additions & 21 deletions src/core/sass/brand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ const brandColorBundle = (

// Create `brand-` prefixed Sass and CSS variables from color.palette
for (const colorKey of Object.keys(brand.data?.color?.palette ?? {})) {
const colorVar = colorKey.replace(/[^a-zA-Z0-9_-]+/, "-");
const colorVar = colorKey.replace(/[^a-zA-Z0-9_-]+/g, "-");
colorVariables.push(
`$brand-${colorVar}: ${brand.getColor(colorKey)} !default;`,
);
Expand Down Expand Up @@ -262,26 +262,21 @@ const brandBootstrapBundle = (
bsVariables.push('// quarto-scss-analysis-annotation { "action": "pop" }');

// Bootstrap Colors from color.palette
let bootstrapColorVariables: string[] = [];
if (Number(brandBootstrap?.version ?? 5) === 5) {
// https://getbootstrap.com/docs/5.3/customize/color/#color-sass-maps
bootstrapColorVariables = [
"blue",
"indigo",
"purple",
"pink",
"red",
"orange",
"yellow",
"green",
"teal",
"cyan",
"black",
"white",
"gray",
"gray-dark"
]
}
// https://getbootstrap.com/docs/5.3/customize/color/#color-sass-maps
const bootstrapColorVariables = [
"black",
"white",
"blue",
"indigo",
"purple",
"pink",
"red",
"orange",
"yellow",
"green",
"teal",
"cyan",
]

const bsColors: string[] = [
"/* Bootstrap color variables from _brand.yml */",
Expand Down
Loading