diff --git a/assets/styles/elements/_document.scss b/assets/styles/elements/_document.scss index 5af79f5..28f5a24 100644 --- a/assets/styles/elements/_document.scss +++ b/assets/styles/elements/_document.scss @@ -5,14 +5,16 @@ // // Simple page-level setup. // -// 1. Ensure the page always fills at least the entire height of the viewport. -// 2. Set the default `font-size` and `line-height` for the entire project, +// 1. Includes fonts +// 2. Ensure the page always fills at least the entire height of the viewport. +// 3. Set the default `font-size` and `line-height` for the entire project, // sourced from our default variables. +@include font-faces($font-faces, $font-dir); // [1] html { - min-height: 100%; // [1] - line-height: $line-height; // [2] + min-height: 100%; // [2] + line-height: $line-height; // [3] font-family: ff("sans"); color: $font-color; -webkit-font-smoothing: antialiased; diff --git a/assets/styles/main.scss b/assets/styles/main.scss index 8e86cf4..6446717 100644 --- a/assets/styles/main.scss +++ b/assets/styles/main.scss @@ -21,8 +21,8 @@ @import "settings/config.colors"; @import "settings/config.eases"; @import "settings/config.fonts"; -@import "settings/config.indexes"; @import "settings/config.timings"; +@import "settings/config.zindexes"; @import "settings/config"; @import "settings/config.variables"; diff --git a/assets/styles/settings/_config.eases.scss b/assets/styles/settings/_config.eases.scss index bfa9fb0..573f20b 100644 --- a/assets/styles/settings/_config.eases.scss +++ b/assets/styles/settings/_config.eases.scss @@ -64,7 +64,7 @@ $eases: ( // ``` // // @param {string} $key - The ease key in $eases. -// @return {bezier curve} +// @return {easing-function} @function ease($key) { @if not map-has-key($eases, $key) { diff --git a/assets/styles/settings/_config.fonts.scss b/assets/styles/settings/_config.fonts.scss index fa5c7bf..a918b09 100644 --- a/assets/styles/settings/_config.fonts.scss +++ b/assets/styles/settings/_config.fonts.scss @@ -33,6 +33,9 @@ $font-families: ( sans: join("Source Sans", $font-fallback-sans, $separator: comma), ); +// Font directory +$font-dir: "../fonts/"; + // Functions // ========================================================================== @@ -93,12 +96,3 @@ $font-families: ( $value: map-get($font-families, $font-family); @return $value; } - - -// Include fonts -// ========================================================================== - -// Font directory -$font-dir: "../fonts/"; - -@include font-faces($font-faces, $font-dir); diff --git a/assets/styles/settings/_config.indexes.scss b/assets/styles/settings/_config.zindexes.scss similarity index 100% rename from assets/styles/settings/_config.indexes.scss rename to assets/styles/settings/_config.zindexes.scss