attempt to fix brand without changing distributions

Author: cscheid

src/format/reveal/format-reveal-theme.ts

@@ -18,7 +18,7 @@ import {
 
 import { isFileRef } from "../../core/http.ts";
 import { pathWithForwardSlashes } from "../../core/path.ts";
-import { formatResourcePath } from "../../core/resources.ts";
+import { formatResourcePath, resourcePath } from "../../core/resources.ts";
 import {
   cleanSourceMappingUrl,
   compileSass,
@@ -164,6 +164,7 @@ export async function revealTheme(
   const quartoLayers = [
     quartoBaseLayer(format, true, true, false, true),
     quartoLayer(),
+    quartoRevealBrandLayer(),
   ];
   const titleSlideLayer = titleSlideScss(format);
   if (titleSlideLayer) {
@@ -284,3 +285,9 @@ function quartoLayer(): SassLayer {
 function themeLayer(theme: string): SassLayer {
   return sassLayerFile(theme);
 }
+
+function quartoRevealBrandLayer(): SassLayer {
+  return sassLayerFile(
+    resourcePath(join("formats", "revealjs", "brand", "brand.scss")),
+  );
+}

src/resources/formats/html/bootstrap/_bootstrap-variables.scss

@@ -244,4 +244,13 @@ $table-group-separator-color-lighter: lighten(
 
 $bootstrap-version: 5;
 
-$h1h2h3-font-weight: 600 !default;
+$h1h2h3-font-weight: 600 !default;
+
+// variables required by _brand.yml
+$font-family-monospace-block: $font-family-monospace !default;
+$font-family-monospace-inline: $font-family-monospace !default;
+$font-weight-monospace: $font-weight-base !default;
+$font-weight-monospace-block: $font-weight-monospace !default;
+$font-weight-monospace-inline: $font-weight-monospace !default;
+$code-block-font-size: $code-font-size !default;
+$code-inline-font-size: $code-font-size !default;

src/resources/formats/html/bootstrap/dist/scss/_variables.scss

@@ -1756,6 +1756,7 @@ $offcanvas-backdrop-opacity:        $modal-backdrop-opacity !default;
 // scss-docs-end offcanvas-variables
 
 // Code
+
 $code-font-size:                    $small-font-size !default;
 // Amount intentionally matches mixture amount of shiny::inputPanel()
 // https://github.com/rstudio/shiny/blob/4eeb4a1/inst/www/shared/shiny_scss/bootstrap.scss#L25
@@ -1772,13 +1773,4 @@ $nested-kbd-font-weight:            null !default; // Deprecated in v5.2.0, remo
 
 $pre-bg:                            $code-bg  !default;
 $pre-color:                         $body-emphasis-color !default;
-$pre-line-height:                   $line-height-base !default;
-
-// variables required by _brand.yml
-$font-family-monospace-block: $font-family-monospace !default;
-$font-family-monospace-inline: $font-family-monospace !default;
-$font-weight-monospace: $font-weight-base !default;
-$font-weight-monospace-block: $font-weight-monospace !default;
-$font-weight-monospace-inline: $font-weight-monospace !default;
-$code-block-font-size: $code-font-size !default;
-$code-inline-font-size: $code-font-size !default;
+$pre-line-height:                   $line-height-base !default;

src/resources/formats/revealjs/quarto.scss

@@ -812,3 +812,16 @@ kbd {
   border-radius: 5px;
   padding: $kbd-padding-y $kbd-padding-x;
 }
+
+:root {
+  --r-inline-code-font: #{$inlineCodeFont};
+  --r-block-code-font: #{$blockCodeFont};
+}
+
+.reveal code {
+  font-family: var(--r-inline-code-font);
+}
+
+.reveal pre code {
+	font-family: var(--r-block-code-font);
+}

src/resources/formats/revealjs/reveal/css/theme/template/exposer.scss

@@ -20,10 +20,8 @@
   --r-heading3-size: #{$heading3Size};
   --r-heading4-size: #{$heading4Size};
   --r-code-font: #{$codeFont};
-  --r-inline-code-font: #{$inlineCodeFont}; /* quarto-specific */
-  --r-block-code-font: #{$blockCodeFont}; /* quarto-specific */
   --r-link-color: #{$linkColor};
-  --r-link-color-dark: #{darken($linkColor, 15%)};
+  --r-link-color-dark: #{darken($linkColor , 15% )};
   --r-link-color-hover: #{$linkColorHover};
   --r-selection-background-color: #{$selectionBackgroundColor};
   --r-selection-color: #{$selectionColor};

src/resources/formats/revealjs/reveal/css/theme/template/theme.scss

@@ -174,6 +174,7 @@
 
 	text-align: left;
 	font-size: 0.55em;
+	font-family: var(--r-code-font);
 	line-height: 1.2em;
 
 	word-wrap: break-word;
@@ -182,13 +183,12 @@
 }
 
 .reveal code {
-	font-family: var(--r-inline-code-font);
+	font-family: var(--r-code-font);
 	text-transform: none;
 	tab-size: 2;
 }
 
 .reveal pre code {
-	font-family: var(--r-block-code-font);
 	display: block;
 	padding: 5px;
 	overflow: auto;