diff --git a/config.yaml b/config.yaml index 2bed54d..64dd0f9 100644 --- a/config.yaml +++ b/config.yaml @@ -68,7 +68,9 @@ params: # main pages options mainPage: # option to specify the main font of the theme - fontFamily: "Lato" + fontFamily: "Barlow" + # option to specify the body font of the theme + bodyFontFamily: "Lato" sizes: [400, 700] # sidebar options diff --git a/themes/hugo-refresh/assets/bulma/sass/utilities/initial-variables.sass b/themes/hugo-refresh/assets/bulma/sass/utilities/initial-variables.sass index 0650ce3..44251ca 100755 --- a/themes/hugo-refresh/assets/bulma/sass/utilities/initial-variables.sass +++ b/themes/hugo-refresh/assets/bulma/sass/utilities/initial-variables.sass @@ -25,7 +25,7 @@ $red: hsl(348, 100%, 61%) !default // Typography -$family-sans-serif: BlinkMacSystemFont, -apple-system, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif !default +$family-sans-serif: $fontBody, BlinkMacSystemFont, -apple-system, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif !default $family-monospace: monospace !default $render-mode: optimizeLegibility !default diff --git a/themes/hugo-refresh/assets/fresh/partials/_sections.scss b/themes/hugo-refresh/assets/fresh/partials/_sections.scss index 763071d..24e5425 100755 --- a/themes/hugo-refresh/assets/fresh/partials/_sections.scss +++ b/themes/hugo-refresh/assets/fresh/partials/_sections.scss @@ -17,7 +17,7 @@ Section Styles height: 75vh !important; } .title, .subtitle { - font-family: 'Open Sans', sans-serif; + font-family: $fontMainPage, sans-serif; } .subtitle { @@ -32,7 +32,7 @@ Section Styles max-width: 500px; margin: 0 auto; .title, .subtitle { - font-family: 'Open Sans', sans-serif; + font-family: $fontMainPage, sans-serif; } .subtitle { diff --git a/themes/hugo-refresh/assets/style.sass b/themes/hugo-refresh/assets/style.sass index 3edaa8d..ea60f22 100755 --- a/themes/hugo-refresh/assets/style.sass +++ b/themes/hugo-refresh/assets/style.sass @@ -1,6 +1,7 @@ $fontMainPage: "{{ .Site.Params.mainPage.fontFamily }}" $fontSidebar: "{{ .Site.Params.sidebar.fontFamily }}" $fontNavbar: "{{ .Site.Params.navbar.fontFamily }}" +$fontBody: "{{ .Site.Params.mainPage.bodyFontFamily }}" $mainColour: {{ .Site.Params.mainColour }} {{ $out_fo := "loader.svg" }} @@ -15,6 +16,9 @@ $loadingImage: "{{- $img.Permalink | relURL }}" @import "bulma/bulma" @import "fresh/core" +h1, h2, h3, h4, h5, h6 + font-family: $fontMainPage + a color: #30BA78 &:hover diff --git a/themes/hugo-refresh/layouts/partials/css.html b/themes/hugo-refresh/layouts/partials/css.html index 46cad12..21a1871 100755 --- a/themes/hugo-refresh/layouts/partials/css.html +++ b/themes/hugo-refresh/layouts/partials/css.html @@ -6,14 +6,17 @@ {{- $font1 := replace .Site.Params.mainPage.fontFamily " " "+" -}} {{- $font2 := replace .Site.Params.sidebar.fontFamily " " "+" -}} {{- $font3 := replace .Site.Params.navbar.fontFamily " " "+" -}} +{{- $font4 := replace .Site.Params.mainPage.bodyFontFamily " " "+" -}} {{- $fontSizes := delimit .Site.Params.mainPage.sizes "," -}} {{- $fontUrl1 := printf "https://fonts.googleapis.com/css?family=%s:%s" $font1 $fontSizes -}} {{- $fontUrl2 := printf "https://fonts.googleapis.com/css?family=%s:%s" $font2 $fontSizes -}} {{- $fontUrl3 := printf "https://fonts.googleapis.com/css?family=%s:%s" $font3 $fontSizes -}} +{{- $fontUrl4 := printf "https://fonts.googleapis.com/css?family=%s:%s" $font4 $fontSizes -}} + {{- $css := resources.Get $sass | resources.ExecuteAsTemplate $scss . | toCSS $cssOpts -}} {{- $css1 := resources.Get "css/monokai-sublime.9.15.8.min.css" -}} diff --git a/themes/hugo-refresh/layouts/partials/hero.html b/themes/hugo-refresh/layouts/partials/hero.html index b41faaa..166ff82 100644 --- a/themes/hugo-refresh/layouts/partials/hero.html +++ b/themes/hugo-refresh/layouts/partials/hero.html @@ -6,15 +6,15 @@
-
+

{{- $title -}}

{{- with $subtitle -}} -

+

{{ . }} -

+

{{- end -}} {{/*