refactor: enhance the configurability of fonts (#986)

v4vong · web-flow · commit 7ec31e894828 · 2023-04-17T01:31:49.000+08:00
diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss
@@ -34,7 +34,7 @@ body {
     env(safe-area-inset-bottom) env(safe-area-inset-left);
   color: var(--text-color);
   -webkit-font-smoothing: antialiased;
-  font-family: 'Source Sans Pro', 'Microsoft Yahei', sans-serif;
+  font-family: $font-family-base;
   line-height: 1.75;
 }
 
diff --git a/_sass/addon/module.scss b/_sass/addon/module.scss
@@ -7,7 +7,7 @@
 %heading {
   color: var(--heading-color);
   font-weight: 400;
-  font-family: Lato, 'Microsoft Yahei', sans-serif;
+  font-family: $font-family-heading;
 }
 
 %section {
diff --git a/_sass/addon/variables.scss b/_sass/addon/variables.scss
@@ -28,3 +28,8 @@ $bottom-min-height: 35rem !default;
 /* syntax highlight */
 
 $code-font-size: 0.85rem !default;
+
+/* fonts */
+
+$font-family-base: 'Source Sans Pro', 'Microsoft Yahei', sans-serif;
+$font-family-heading: Lato, 'Microsoft Yahei', sans-serif;
diff --git a/_sass/jekyll-theme-chirpy.scss b/_sass/jekyll-theme-chirpy.scss
@@ -10,9 +10,9 @@
   "colors/light-typography",
   "colors/dark-typography",
 
-  "addon/module",
   "addon/variables",
   "variables-hook",
+  "addon/module",
   "addon/syntax",
   "addon/commons",
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ body {`
`34`	`34`	`env(safe-area-inset-bottom) env(safe-area-inset-left);`
`35`	`35`	`color: var(--text-color);`
`36`	`36`	`-webkit-font-smoothing: antialiased;`
`37`		`- font-family: 'Source Sans Pro', 'Microsoft Yahei', sans-serif;`
	`37`	`+ font-family: $font-family-base;`
`38`	`38`	`line-height: 1.75;`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`%heading {`
`8`	`8`	`color: var(--heading-color);`
`9`	`9`	`font-weight: 400;`
`10`		`- font-family: Lato, 'Microsoft Yahei', sans-serif;`
	`10`	`+ font-family: $font-family-heading;`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`%section {`