Skip to content

Commit df85b91

Browse files
committed
brand - insert brand defaults in the right spot
1 parent 93ff8ab commit df85b91

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/core/sass/brand.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ const brandDefaultsBootstrapLayer = (
232232
throw new Error(
233233
"Invalid bootstrap defaults in _brand.yml or `brand`. " +
234234
"`defaults.bootstrap.defaults` expects a string or a dictionary " +
235-
"mapping Sass variables to default values."
235+
"mapping Sass variables to default values.",
236236
);
237237
}
238238
bsVariables.push('// quarto-scss-analysis-annotation { "action": "pop" }');
@@ -273,7 +273,7 @@ const brandDefaultsBootstrapLayer = (
273273

274274
const scssWithQuartoAnnotation = (
275275
x: string | undefined,
276-
origin: string
276+
origin: string,
277277
): string => {
278278
if (!x) {
279279
return "";
@@ -285,13 +285,13 @@ const brandDefaultsBootstrapLayer = (
285285
'// quarto-scss-analysis-annotation { "action": "pop" }',
286286
].join("\n");
287287
};
288-
288+
289289
return {
290290
defaults: bsColors.join("\n") + "\n" + bsVariables.join("\n"),
291291
uses: scssWithQuartoAnnotation(brandBootstrap.uses, "uses"),
292292
functions: scssWithQuartoAnnotation(
293293
brandBootstrap.functions,
294-
"functions"
294+
"functions",
295295
),
296296
mixins: scssWithQuartoAnnotation(brandBootstrap.mixins, "mixins"),
297297
rules: scssWithQuartoAnnotation(brandBootstrap.rules, "rules"),
@@ -591,7 +591,7 @@ export async function brandBootstrapSassLayers(
591591

592592
const brand = await project.resolveBrand(fileName);
593593
if (brand?.data?.defaults?.bootstrap) {
594-
layers.push(brandDefaultsBootstrapLayer(brand));
594+
layers.unshift(brandDefaultsBootstrapLayer(brand));
595595
}
596596

597597
return layers;

0 commit comments

Comments
 (0)