diff --git a/assets/sass/elements/_headings.scss b/assets/sass/elements/_headings.scss new file mode 100644 index 00000000..4243ef65 --- /dev/null +++ b/assets/sass/elements/_headings.scss @@ -0,0 +1,6 @@ +h1, +h2, +h3 { + font-family: $heading-font-family; + font-weight: 700; +} diff --git a/assets/sass/elements/_html.scss b/assets/sass/elements/_html.scss new file mode 100644 index 00000000..60e84ebb --- /dev/null +++ b/assets/sass/elements/_html.scss @@ -0,0 +1,9 @@ +html { + font-family: $body-font-family; + font-style: normal; + font-weight: 300; + font-size: 1.25em; + line-height: 1.4; + padding-left: $pad-min; + padding-right: $pad-min; +} diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 6167c375..227eecea 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -18,7 +18,9 @@ // 4. Elements – styling for bare HTML elements (like H1, A, etc.). // These come with default styling from the browser so we can redefine // them here. +@import "elements/html"; @import "elements/figure"; +@import "elements/headings"; // 5. Objects – class-based selectors which define undecorated design patterns, // for example media object known from OOCSS diff --git a/assets/sass/settings/_typography.scss b/assets/sass/settings/_typography.scss index e9a0505c..e2a6bd2b 100644 --- a/assets/sass/settings/_typography.scss +++ b/assets/sass/settings/_typography.scss @@ -1,5 +1,5 @@ -$heading-font-family: "Sentinel SSm A", "Sentinel SSm B", Georgia, Times, "Times New Roman", serif; -$body-font-family: "Sentinel SSm A", "Sentinel SSm B", Georgia, Times, "Times New Roman", serif; +$heading-font-family: "Gotham A", "Gotham B", Georgia, Times, "Times New Roman", serif; +$body-font-family: "Mercury SSm A", "Mercury SSm B", Georgia, Times, "Times New Roman", serif; $mono: "Source Code Pro", "Consolas", "Menlo", monospace !default; $header-title-font-family: $heading-font-family !default; $header-subtitle-font-family: $heading-font-family !default; diff --git a/assets/sass/tools/_container.scss b/assets/sass/tools/_container.scss index b1bb7c57..6f5c68b1 100644 --- a/assets/sass/tools/_container.scss +++ b/assets/sass/tools/_container.scss @@ -2,6 +2,4 @@ margin-left: auto; margin-right: auto; max-width: $max-width; - padding-left: $pad-min; - padding-right: $pad-min; } diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 05102d1c..5e8af574 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -4,6 +4,7 @@ {{ .Site.Title }} {{ end }} + {{ $sass := resources.Get "sass/main.scss" }} {{ $style := $sass | resources.ToCSS }}