diff --git a/assets/sass/academic/_nav.scss b/assets/sass/academic/_nav.scss index cca97408..ecb13a6e 100644 --- a/assets/sass/academic/_nav.scss +++ b/assets/sass/academic/_nav.scss @@ -36,7 +36,6 @@ nav#navbar-main li.nav-item { -webkit-transition: 0.2s ease; transition: 0.2s ease; color: $sta-menu-text; - font-weight: 600; } .navbar-light .navbar-nav>.nav-item>.nav-link:focus { diff --git a/assets/sass/bootstrap_variables.scss b/assets/sass/bootstrap_variables.scss index f874437e..08a9b81d 100644 --- a/assets/sass/bootstrap_variables.scss +++ b/assets/sass/bootstrap_variables.scss @@ -1,3 +1,13 @@ /* Set Bootstrap variables */ + +// Set colors. $primary: $sta-primary; $text-muted: rgba(0,0,0,0.54); + +// Container widths - override XL default of `1140px`. +$container-max-widths: ( + sm: 540px, + md: 720px, + lg: 960px, + xl: 1200px +); diff --git a/data/fonts/playfair.toml b/data/fonts/playfair.toml deleted file mode 100644 index 7f4cb698..00000000 --- a/data/fonts/playfair.toml +++ /dev/null @@ -1,15 +0,0 @@ -# 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/data/fonts/rose.toml b/data/fonts/rose.toml new file mode 100644 index 00000000..429991fe --- /dev/null +++ b/data/fonts/rose.toml @@ -0,0 +1,15 @@ +# Font style metadata +name = "Rose" + +# Optional Google font URL +google_fonts = "Cutive+Mono|Lora:400,700|Roboto:400,700" + +# Font families +heading_font = "Lora" +body_font = "Roboto" +nav_font = "Lora" +mono_font = "Cutive Mono" + +# Font size +font_size = "20" +font_size_small = "16" diff --git a/data/themes/cupcake.toml b/data/themes/cupcake.toml deleted file mode 100644 index 9da425fe..00000000 --- a/data/themes/cupcake.toml +++ /dev/null @@ -1,18 +0,0 @@ -# Theme metadata -name = "Cupcake" - -# Is theme light or dark? -light = true - -# Primary -primary = "#EC407A" - -# Menu -menu_primary = "#BE37C7" -menu_text = "#FFB298" -menu_text_active = "#fff" -menu_title = "#FFB298" - -# Home sections -home_section_odd = "#FFB298" -home_section_even = "#FFB298" diff --git a/data/themes/rose.toml b/data/themes/rose.toml new file mode 100644 index 00000000..24d9dbcf --- /dev/null +++ b/data/themes/rose.toml @@ -0,0 +1,18 @@ +# Theme metadata +name = "Rose" + +# Is theme light or dark? +light = true + +# Primary +primary = "rgb(251, 191, 183)" + +# Menu +menu_primary = "rgb(247, 247, 247)" +menu_text = "#000" +menu_text_active = "rgb(25, 25, 25)" +menu_title = "#000" + +# Home sections +home_section_odd = "#FFF" +home_section_even = "rgb(234, 242, 250)" diff --git a/layouts/partials/site_head.html b/layouts/partials/site_head.html index 4702e378..3b8aa157 100644 --- a/layouts/partials/site_head.html +++ b/layouts/partials/site_head.html @@ -96,7 +96,7 @@ {{/* We cannot use SRI with Google Fonts because the CSS is dynamically generated according to the user agent. */}} {{ with ($scr.Get "google_fonts") }} - + {{ end }} {{ $css_options := (dict "targetPath" "css/academic.css" "outputStyle" "compressed") }} @@ -170,7 +170,10 @@ - {{- with $og_image }}{{end}} + {{- with $og_image -}} + + + {{- end -}} {{ if .IsPage }} {{ if not .PublishDate.IsZero }}