content-font option added

2020-01-25 19:59:40 +09:00 · 2020-01-25 19:59:40 +09:00 · e6bfddfca0
parent 2f70d5c928
commit e6bfddfca0
3 changed files with 4 additions and 3 deletions
--- a/assets/sass/abstracts/_variables.scss
+++ b/assets/sass/abstracts/_variables.scss
@ -1,6 +1,7 @@
@import "../themes/theme";

-$text-font-stack: 'Muli',
+$text-font-stack: $content-font, 
+              'Muli',
              avenir,
              'helvetica neue', helvetica,
              ubuntu,
--- a/data/font.toml
+++ b/data/font.toml
@ -1,3 +1,3 @@
 title_font = "\"Montserrat\", sans-serif"
-content_font = "\"Merriweather\", serif"
+content_font = "\"Muli\", sans-serif"
 cursive_font = "\"Courgette\", cursive"
--- a/exampleSite/resources/_gen/assets/scss/sass/main.scss_b4f67ac5085b89b62b54c1923e5a9145.content
+++ b/exampleSite/resources/_gen/assets/scss/sass/main.scss_b4f67ac5085b89b62b54c1923e5a9145.content