From ec8ad74a45d5b4da380b293bde3ae9f58fd35709 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 28 Feb 2025 14:55:00 +0100 Subject: [PATCH 1/2] revealjs - simple and serif should have their heading color defaults to body-color (cherry picked from commit f8a9a3c68666c9ac0781d0e7dbfcb69ecb6cf1fb) --- package/src/common/patches/revealjs-theme-0001-simple.patch | 2 +- package/src/common/patches/revealjs-theme-0001-sky.patch | 2 +- src/resources/formats/revealjs/themes/simple.scss | 2 +- src/resources/formats/revealjs/themes/sky.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/src/common/patches/revealjs-theme-0001-simple.patch b/package/src/common/patches/revealjs-theme-0001-simple.patch index 7a76407c923..c66acdead03 100644 --- a/package/src/common/patches/revealjs-theme-0001-simple.patch +++ b/package/src/common/patches/revealjs-theme-0001-simple.patch @@ -28,7 +28,7 @@ index f0472d7b9..3b1e3cbdc 100644 +$font-family-sans-serif: "Lato", sans-serif !default; +$body-color: #000 !default; +$presentation-heading-font: "News Cycle", sans-serif !default; -+$presentation-heading-color: #000 !default; ++$presentation-heading-color: $body-color !default; +$presentation-heading-text-shadow: none !default; +$presentation-heading-text-transform: none !default; +$body-bg: #fff !default; diff --git a/package/src/common/patches/revealjs-theme-0001-sky.patch b/package/src/common/patches/revealjs-theme-0001-sky.patch index 8cd3267b9df..9f388f08432 100644 --- a/package/src/common/patches/revealjs-theme-0001-sky.patch +++ b/package/src/common/patches/revealjs-theme-0001-sky.patch @@ -28,7 +28,7 @@ index 62a52b782..2debff7bc 100644 +$font-family-sans-serif: "Open Sans", sans-serif !default; +$body-color: #333 !default; +$presentation-heading-font: "Quicksand", sans-serif !default; -+$presentation-heading-color: #333 !default; ++$presentation-heading-color: $body-color !default; +$presentation-heading-letter-spacing: -0.08em !default; +$presentation-heading-text-shadow: none !default; +$body-bg: #f7fbfc !default; diff --git a/src/resources/formats/revealjs/themes/simple.scss b/src/resources/formats/revealjs/themes/simple.scss index 3b1e3cbdc35..738528455c6 100644 --- a/src/resources/formats/revealjs/themes/simple.scss +++ b/src/resources/formats/revealjs/themes/simple.scss @@ -19,7 +19,7 @@ $font-family-sans-serif: "Lato", sans-serif !default; $body-color: #000 !default; $presentation-heading-font: "News Cycle", sans-serif !default; -$presentation-heading-color: #000 !default; +$presentation-heading-color: $body-color !default; $presentation-heading-text-shadow: none !default; $presentation-heading-text-transform: none !default; $body-bg: #fff !default; diff --git a/src/resources/formats/revealjs/themes/sky.scss b/src/resources/formats/revealjs/themes/sky.scss index 4821a919dad..5e369cfadac 100644 --- a/src/resources/formats/revealjs/themes/sky.scss +++ b/src/resources/formats/revealjs/themes/sky.scss @@ -17,7 +17,7 @@ $font-family-sans-serif: "Open Sans", sans-serif !default; $body-color: #333 !default; $presentation-heading-font: "Quicksand", sans-serif !default; -$presentation-heading-color: #333 !default; +$presentation-heading-color: $body-color !default; $presentation-heading-letter-spacing: -0.08em !default; $presentation-heading-text-shadow: none !default; $body-bg: #f7fbfc !default; From 276017f1dd442a06be31f58c73af09296b7d97a2 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 28 Feb 2025 16:04:18 +0100 Subject: [PATCH 2/2] add to changelog [skip ci] --- news/changelog-1.6.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/news/changelog-1.6.md b/news/changelog-1.6.md index cbdebcfff1f..41c80cf9882 100644 --- a/news/changelog-1.6.md +++ b/news/changelog-1.6.md @@ -2,6 +2,8 @@ ## In this release +- ([#12147](https://github.com/quarto-dev/quarto-cli/issues/12147)): `serif` and `simple` themes defaults back to have their heading color (`$presentation-heading-color`) to be the same as the body color (`$body-color`) as in Quarto 1.5. + ## In previous releases - ([#12148](https://github.com/quarto-dev/quarto-cli/issues/12148)): Don't import libraries outside of `core/lib` into `core/lib`, to avoid pulling in Deno-specific requirements into browser environments.