diff --git a/data/fonts/classic.toml b/data/fonts/classic.toml index 3b24d07b..65c4ef09 100644 --- a/data/fonts/classic.toml +++ b/data/fonts/classic.toml @@ -2,11 +2,12 @@ name = "Classic" # Optional Google font URL -google_fonts = "Playfair+Display:400,700|Fauna+One" +google_fonts = "Lato:400,700|Merriweather|Roboto+Mono" # Font families -heading_font = "Playfair Display" -body_font = "Fauna One" +heading_font = "Lato" +body_font = "Merriweather" +nav_font = "Lato" mono_font = "Roboto Mono" # Font size diff --git a/data/fonts/default.toml b/data/fonts/default.toml index 9ca2bc2a..3545a21e 100644 --- a/data/fonts/default.toml +++ b/data/fonts/default.toml @@ -7,6 +7,7 @@ google_fonts = "Montserrat:400,700|Roboto:400,400italic,700|Roboto+Mono" # Font families heading_font = "Montserrat" body_font = "Roboto" +nav_font = "Roboto" mono_font = "Roboto Mono" # Font size diff --git a/data/fonts/playfair.toml b/data/fonts/playfair.toml new file mode 100644 index 00000000..7f4cb698 --- /dev/null +++ b/data/fonts/playfair.toml @@ -0,0 +1,15 @@ +# Font style metadata +name = "Playfair" + +# Optional Google font URL +google_fonts = "Playfair+Display:400,700|Fauna+One" + +# Font families +heading_font = "Playfair Display" +body_font = "Fauna One" +nav_font = "Fauna One" +mono_font = "Roboto Mono" + +# Font size +font_size = "20" +font_size_small = "16" diff --git a/exampleSite/config.toml b/exampleSite/config.toml index a033d601..8363fcc4 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -29,7 +29,7 @@ defaultContentLanguageInSubdir = false color_theme = "default" # Font style. - # Choose from `default` or `classic`. + # Choose from `default`, `classic`, or `playfair`. font = "default" # Your details. diff --git a/layouts/partials/css/academic.css b/layouts/partials/css/academic.css index 62b6fa7b..be59fea5 100644 --- a/layouts/partials/css/academic.css +++ b/layouts/partials/css/academic.css @@ -61,7 +61,7 @@ ul, ol, dl { /* Navigation bar text */ .navbar-default { - font-family: '{{ .Get "body_font" }}', sans-serif; + font-family: '{{ .Get "nav_font" }}', sans-serif; font-weight: 400; line-height: 1.25; text-rendering: optimizeLegibility; diff --git a/layouts/partials/css/parse_theme.css b/layouts/partials/css/parse_theme.css index 9a57a70e..343a84e6 100644 --- a/layouts/partials/css/parse_theme.css +++ b/layouts/partials/css/parse_theme.css @@ -8,6 +8,7 @@ {{- $scr.Set "google_fonts" $font.google_fonts -}} {{- $scr.Set "body_font" $font.body_font -}} {{- $scr.Set "heading_font" $font.heading_font -}} + {{- $scr.Set "nav_font" $font.nav_font -}} {{- $scr.Set "mono_font" $font.mono_font -}} {{- $scr.Set "font_size" $font.font_size -}} {{- $scr.Set "font_size_small" $font.font_size_small -}}