diff --git a/src/scss/type/font/_font_default.scss b/src/scss/type/font/_font_default.scss index 2ef84be..ae4b10e 100644 --- a/src/scss/type/font/_font_default.scss +++ b/src/scss/type/font/_font_default.scss @@ -13,60 +13,42 @@ // limitations under the License. - // ============================================================================ // Typography | Font | Base // ============================================================================ - @mixin font_default { - font-family: $font_stack_sans_serif; // family-name | generic-family | initial | inherit - - font-smooth: auto; // auto|never|always - -webkit-font-smoothing: antialiased; // auto|none|antialiased|subpixel-antialiased - -moz-osx-font-smoothing: grayscale; // auto|grayscale - text-rendering: optimizeLegibility; // auto|optimizeSpeed|optimizeLegibility|geometricPrecision|inherit|initial|unset - font-language-override: normal; // normal | "ENG" - font-optical-sizing: auto; // auto | none - font-style: normal; // normal | italic | oblique | initial | inherit - - // font-variant: normal; // normal | small-caps | initial | inherit - font-variant-alternates: normal; // normal | [ stylistic( ) || historical-forms || styleset( # ) || character-variant( # ) || swash( ) || ornaments( ) || annotation( ) ] + font-family: $font_stack_sans_serif; + + font-smooth: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-rendering: optimizeLegibility; + font-language-override: normal; + font-optical-sizing: auto; + font-style: normal; + + // font-variant: normal; + font-variant-alternates: normal; font-variant-caps: normal; // normal | small-caps | all-small-caps | petite-caps | all-petite-caps | unicase | titling-caps | initial | inherit | unset font-variant-east-asian: normal; // normal | [ || || ruby ]where = [ jis78 | jis83 | jis90 | jis04 | simplified | traditional ] = [ full-width | proportional-width ] font-variant-emoji: text; // normal | text | emoji font-variant-ligatures: normal; // normal | none | [ || || || ] font-variant-numeric: normal; // normal | [ || || || ordinal || slashed-zero ] - font-variant-position: normal; // normal | sub | super - + font-variant-position: normal; + //font-variation-settings - font-kerning: normal; // auto, normal, none - font-feature-settings: none; // normal, feature-value - font-size-adjust: none; // number, none, initial, inherit - font-stretch: 100%; // ultra-condensed, extra-condensed, condensed, semi-condensed, normal, semi-expanded, expanded, extra-expanded, ultra-expanded, initial, inherit + font-kerning: normal; + font-feature-settings: none; + font-size-adjust: none; + // Consider using "normal" unless a specific stretch is needed + font-stretch: 100%; // color: $color_02; color: black; background-color: none; } -// @mixin font_default { -// font-family: $font_stack; // family-name | generic-family | initial | inherit -// font-style: normal; // normal | italic | oblique | initial | inherit -// // font-variant: normal; // normal | small-caps | initial | inherit -// font-variant-caps: normal; // normal | small-caps | all-small-caps | petite-caps | all-petite-caps | unicase | titling-caps | initial | inherit | unset -// font-variant-alternates: normal; // normal | [ stylistic( ) || historical-forms || styleset( # ) || character-variant( # ) || swash( ) || ornaments( ) || annotation( ) ] -// font-variant-ligatures: normal; // normal | none | [ || || || ] -// font-variant-numeric: normal; // normal | [ || || || ordinal || slashed-zero ] -// font-variant-position: normal; // normal | sub | super -// font-variant-east-asian: normal; // normal | [ || || ruby ]where = [ jis78 | jis83 | jis90 | jis04 | simplified | traditional ] = [ full-width | proportional-width ] -// //font-variation-settings -// font-kerning: normal; // auto, normal, none -// font-feature-settings: none; // normal, feature-value -// font-size-adjust: none; // number, none, initial, inherit -// font-stretch: normal; // ultra-condensed, extra-condensed, condensed, semi-condensed, normal, semi-expanded, expanded, extra-expanded, ultra-expanded, initial, inherit -// color: $color_02; -// background-color: none; -// } + html { @include font_default; } diff --git a/src/scss/type/font/_font_weight.scss b/src/scss/type/font/_font_weight.scss index 826bf69..53c2fde 100644 --- a/src/scss/type/font/_font_weight.scss +++ b/src/scss/type/font/_font_weight.scss @@ -25,8 +25,8 @@ $font_weight_min: 22; // Minimum font weight $font_weight_max: 188; // Maximum font weight // Define Minimum and Maximum Font Widths -$font_weight_min: 300; // Minimum font width -$font_weight_max: 500; // Maximum font width +$font_width_min: 300; // Minimum font width +$font_width_max: 500; // Maximum font width // Define Number of Steps $font_weight_steps: 9; // Number of steps