Merge pull request #151 from Bisaloo/font-variable

Use a Sass variable for default font
carpentries · Oct 30, 2024 · 68b8cef · 68b8cef
2 parents 34192f5 + ff079ae
commit 68b8cef
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 15 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,24 @@
+# varnish 1.0.5.9000 ()
+
+## NEW FEATURES
+
+* Two new Sass variables (`default_font` and `mono_font`) have been created to
+  simplify the process of changing the default font and monospace font. 
+  In particular, this can be helpful for forks defining their own theme
+  (@Bisaloo #151)
+* Carpentry-specific favicons are now used automatically based on the value of
+  the `carpentry:` value in the `config.yaml` file (@Bisaloo, #152, based on a
+  report from @zkamvar in #33).
+
+
 # varnish 1.0.4 (2024-08-23)
 
 ## NEW FEATURES
 
+* Two new Sass variables (`default_font` and `mono_font`) have been created to
+  simplify the process of changing the default font and monospace font. 
+  In particular, this can be helpful for forks defining their own theme
+  (@Bisaloo #151)
 * Carpentry-specific favicons are now used automatically based on the value of
   the `carpentry:` value in the `config.yaml` file (@Bisaloo, #152, based on a
   report from @zkamvar in #33).

diff --git a/inst/pkgdown/assets/assets/styles.css b/inst/pkgdown/assets/assets/styles.css
diff --git a/inst/pkgdown/assets/assets/styles.css.map b/inst/pkgdown/assets/assets/styles.css.map
diff --git a/source/stylesheets/callouts.scss b/source/stylesheets/callouts.scss
@@ -138,7 +138,7 @@
   }
   .accordion-item {
     border-color: $black;
-    font-family: Mulish;
+    font-family: $default_font;
     font-style: normal;
     font-weight: normal;
     font-size: 1.2rem;
@@ -151,7 +151,7 @@
     }
   }
   .accordion-header {
-    font-family: Mulish;
+    font-family: $default_font;
     font-style: normal;
     font-weight: normal;
     font-size: 1.2rem;
@@ -197,7 +197,7 @@
       box-shadow: #0d6efd 0px 0px 0px 4px;
     }
     &, h3 {
-      font-family: Mulish;
+      font-family: $default_font;
       font-size: 1.2rem;
       font-style: normal;
       font-weight: normal;

diff --git a/source/stylesheets/codeblocks.scss b/source/stylesheets/codeblocks.scss
@@ -9,7 +9,7 @@ div.sourceCode {
 /* ZNK: added in 2022-01-07 */
 
 pre {
-  font-family: 'Source Code Pro', monospace;
+  font-family: $mono_font, monospace;
   font-style: normal;
   font-weight: normal;
   font-size: 16px;

diff --git a/source/stylesheets/footer.scss b/source/stylesheets/footer.scss
@@ -1,6 +1,6 @@
 .footer {
 	margin-top: 25px;
-	font-family: Mulish;
+	font-family: $default_font;
 	font-style: normal;
 	font-weight: 300;
 	font-size: 14px;
@@ -11,4 +11,4 @@
 
 .footer p{
 	padding-left: 20px;
-}
+}
diff --git a/source/stylesheets/header.scss b/source/stylesheets/header.scss
@@ -28,7 +28,7 @@
 }
 
 .mobile-title {
-  font-family: Mulish;
+  font-family: $default_font;
   font-style: normal;
   font-weight: 800;
   font-size: 24px;
@@ -167,7 +167,7 @@
 }
 
 .lesson-title {
-  font-family: Mulish;
+  font-family: $default_font;
   font-style: normal;
   font-weight: 800;
   font-size: 24px;
@@ -359,7 +359,7 @@
 
   .lesson-title-md {
     display: block;
-    font-family: Mulish;
+    font-family: $default_font;
     font-style: normal;
     font-weight: 800;
     font-size: 32px;
@@ -462,7 +462,7 @@
 
   .lesson-title-md {
     display: inline-block;
-    font-family: Mulish;
+    font-family: $default_font;
     font-style: normal;
     font-weight: 800;
     font-size: 32px;

diff --git a/source/stylesheets/instructornotes.scss b/source/stylesheets/instructornotes.scss
@@ -13,7 +13,7 @@
      padding: 25px 35px;
      background: $light-gray;
      li {
-      list-style-type: inherit; 
+      list-style-type: inherit;
       margin-left: 0px;
       margin-top:10px;
       margin-bottom:20px;
@@ -31,7 +31,7 @@
       box-shadow: #0d6efd 0px 0px 0px 4px;
     }
     &, h3 {
-      font-family: Mulish;
+      font-family: $default_font;
       font-size: 16px;
       font-style: normal;
       font-weight: normal;

diff --git a/source/stylesheets/styles.css.scss b/source/stylesheets/styles.css.scss
@@ -70,7 +70,7 @@
 }
 
 body {
-  font-family: 'Mulish', sans serif;
+  font-family: $default_font, sans serif;
   font-weight: $font_weight_normal;
 }
 

diff --git a/source/stylesheets/variables.scss b/source/stylesheets/variables.scss
@@ -1,5 +1,7 @@
 $font_weight_normal: 400;
 $font_weight_bold: 800;
+$default_font: Mulish;
+$mono_font: 'Source Code Pro';
 $asset_base_path: '../assets' !default;
 
 $black: #383838;
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,7 @@ @@
     }
     body {
-      font-family: 'Mulish', sans serif;
+      font-family: $default_font, sans serif;
       font-weight: $font_weight_normal;
     }
@@ Expand Down @@