diff --git a/news/changelog-1.11.md b/news/changelog-1.11.md index db98133f40..48af47cc38 100644 --- a/news/changelog-1.11.md +++ b/news/changelog-1.11.md @@ -144,6 +144,7 @@ All changes included in 1.11: - ([#15091](https://github.com/quarto-dev/quarto-cli/pull/15091)): Fix page-level `bread-crumbs`, `back-to-top-navigation`, `page-navigation`, `margin-header` and `margin-footer` options not being validated or offered for completion in editors. A page value of the wrong type now fails to render with an error instead of being accepted silently. - ([#15091](https://github.com/quarto-dev/quarto-cli/pull/15091)): Fix `open-graph: false` or `twitter-card: false` in page front matter or `_metadata.yml` not disabling Open Graph or Twitter Card metadata for that page when the website enables it. - ([#15114](https://github.com/quarto-dev/quarto-cli/pull/15114)): Fix a website category containing backticks showing broken text in the page title block, and a category containing a backslash, such as a Windows path, failing the render or losing its backslashes. +- ([#15176](https://github.com/quarto-dev/quarto-cli/issues/15176)): Fix the listing styles of website projects overriding `!default` values of a theme, such as `$border-color`, `$border-radius` and the grays of Bootswatch themes. Websites now get the same theme colors as a standalone document. (author: @Don-Yin) - ([#15206](https://github.com/quarto-dev/quarto-cli/issues/15206)): Fix website listings attaching another update handler on every URL hash change, and an extra one per additional listing on the same page. - ([#15217](https://github.com/quarto-dev/quarto-cli/pull/15217)): Fix website listings updating twice for each click on a pagination link. diff --git a/src/resources/projects/website/listing/quarto-listing.scss b/src/resources/projects/website/listing/quarto-listing.scss index fb55eb8e5b..adef203b7f 100644 --- a/src/resources/projects/website/listing/quarto-listing.scss +++ b/src/resources/projects/website/listing/quarto-listing.scss @@ -77,7 +77,7 @@ } } -/*-- scss:variables --*/ +/*-- scss:defaults --*/ // Since we use these colors, we need to ensure that they // are defined (for example, if no theme is specified) diff --git a/tests/docs/smoke-all/2026/10/26/issue-15176/.gitignore b/tests/docs/smoke-all/2026/10/26/issue-15176/.gitignore new file mode 100644 index 0000000000..ad293093b0 --- /dev/null +++ b/tests/docs/smoke-all/2026/10/26/issue-15176/.gitignore @@ -0,0 +1,2 @@ +/.quarto/ +**/*.quarto_ipynb diff --git a/tests/docs/smoke-all/2026/10/26/issue-15176/_quarto.yml b/tests/docs/smoke-all/2026/10/26/issue-15176/_quarto.yml new file mode 100644 index 0000000000..b94911d952 --- /dev/null +++ b/tests/docs/smoke-all/2026/10/26/issue-15176/_quarto.yml @@ -0,0 +1,6 @@ +project: + type: website + +format: + html: + theme: [default, custom.scss] diff --git a/tests/docs/smoke-all/2026/10/26/issue-15176/custom.scss b/tests/docs/smoke-all/2026/10/26/issue-15176/custom.scss new file mode 100644 index 0000000000..627245379d --- /dev/null +++ b/tests/docs/smoke-all/2026/10/26/issue-15176/custom.scss @@ -0,0 +1,3 @@ +/*-- scss:defaults --*/ +$border-color: #ff0000 !default; +$border-radius: 1rem !default; diff --git a/tests/docs/smoke-all/2026/10/26/issue-15176/index.qmd b/tests/docs/smoke-all/2026/10/26/issue-15176/index.qmd new file mode 100644 index 0000000000..76ee727fae --- /dev/null +++ b/tests/docs/smoke-all/2026/10/26/issue-15176/index.qmd @@ -0,0 +1,10 @@ +--- +title: "issue-15176" +_quarto: + tests: + html: + ensureCssRegexMatches: + - ['--bs-border-color:\s*#ff0000', '--bs-border-radius:\s*1rem'] +--- + +A website theme sets `$border-color` and `$border-radius` with `!default`, and the listing styles must not override them.