From 47a774943c973f90c129dec6b818cb700134bca3 Mon Sep 17 00:00:00 2001 From: andy-saint Date: Sat, 6 Sep 2014 10:42:43 +0100 Subject: [PATCH] Added font stack variables --- scss/foundation/_settings.scss | 9 +++++++-- scss/foundation/components/_global.scss | 7 ++++++- scss/foundation/components/_type.scss | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scss/foundation/_settings.scss b/scss/foundation/_settings.scss index a243cc89f..63153b981 100644 --- a/scss/foundation/_settings.scss +++ b/scss/foundation/_settings.scss @@ -86,6 +86,11 @@ $include-html-global-classes: $include-html-classes; // c. Global // - - - - - - - - - - - - - - - - - - - - - - - - - +// We use these to define default font stacks +// $font-family-sans-serif: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; +// $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif; +// $font-family-monospace: Consolas, "Liberation Mono", Courier, monospace; + // We use these to define default font weights // $font-weight-normal: normal !default; // $font-weight-bold: bold !default; @@ -121,7 +126,7 @@ $include-html-global-classes: $include-html-classes; // We use these to control various global styles // $body-bg: $white; // $body-font-color: $jet; -// $body-font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; +// $body-font-family: $font-family-sans-serif; // $body-font-weight: $font-weight-normal; // $body-font-style: normal; @@ -239,7 +244,7 @@ $include-html-global-classes: $include-html-classes; // We use these to style tags // $code-color: $oil; -// $code-font-family: Consolas, 'Liberation Mono', Courier, monospace; +// $code-font-family: $font-family-monospace; // $code-font-weight: $font-weight-normal; // $code-background-color: scale-color($secondary-color, $lightness: 70%); // $code-border-size: 1px; diff --git a/scss/foundation/components/_global.scss b/scss/foundation/components/_global.scss index f7f07d8b2..d6a18d6f8 100644 --- a/scss/foundation/components/_global.scss +++ b/scss/foundation/components/_global.scss @@ -248,6 +248,11 @@ $oil : #333333 !default; $jet : #222222 !default; $black : #000000 !default; +// We use these to define default font stacks +$font-family-sans-serif: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif !default; +$font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif !default; +$font-family-monospace: Consolas, "Liberation Mono", Courier, monospace !default; + // We use these to define default font weights $font-weight-normal: normal !default; $font-weight-bold: bold !default; @@ -255,7 +260,7 @@ $font-weight-bold: bold !default; // We use these to control various global styles $body-bg: #fff !default; $body-font-color: #222 !default; -$body-font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default; +$body-font-family: $font-family-sans-serif !default; $body-font-weight: $font-weight-normal !default; $body-font-style: normal !default; diff --git a/scss/foundation/components/_type.scss b/scss/foundation/components/_type.scss index f91fa0942..bdaef41dc 100644 --- a/scss/foundation/components/_type.scss +++ b/scss/foundation/components/_type.scss @@ -56,7 +56,7 @@ $paragraph-text-rendering: optimizeLegibility !default; // We use these to style tags $code-color: $oil !default; -$code-font-family: Consolas, 'Liberation Mono', Courier, monospace !default; +$code-font-family: $font-family-monospace !default; $code-font-weight: $font-weight-normal !default; $code-background-color: scale-color($secondary-color, $lightness: 70%) !default; $code-border-size: 1px !default; -- 2.47.2