From: Tim Hartwick Date: Thu, 28 Apr 2016 23:41:45 +0000 (-0700) Subject: moved typography variables in to typography.scss X-Git-Tag: v2.2.1~8^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dd792d9ed2bda6d86973f74a3d826bb5349cd6f;p=thirdparty%2Ffoundation%2Ffoundation-emails.git moved typography variables in to typography.scss --- diff --git a/scss/_global.scss b/scss/_global.scss index 30b52160..5457f20f 100755 --- a/scss/_global.scss +++ b/scss/_global.scss @@ -70,14 +70,6 @@ $body-background: $light-gray !default; /// @type Color $container-background: $white !default; -/// Global font color. -/// @type Color -$global-font-color: $black !default; - -/// Global font family. -/// @type Font -$body-font-family: Helvetica, Arial, sans-serif !default; - /// Global padding. /// @type Number $global-padding: 16px !default; diff --git a/scss/components/_typography.scss b/scss/components/_typography.scss index 81bb40a9..7b8250e0 100755 --- a/scss/components/_typography.scss +++ b/scss/components/_typography.scss @@ -6,6 +6,14 @@ /// @group typography //// +/// Global font color. +/// @type Color +$global-font-color: $black !default; + +/// Global font family. +/// @type Font +$body-font-family: Helvetica, Arial, sans-serif !default; + /// Global font weight. /// @type Keyword $global-font-weight: normal !default; diff --git a/test/visual/pages/basic.html b/test/visual/pages/basic.html index 9a39cb1b..df654553 100644 --- a/test/visual/pages/basic.html +++ b/test/visual/pages/basic.html @@ -16,11 +16,11 @@
- +

Hi, Susan Calvin

-

YO YOY Lorem ipsum dolor sit amet, consectetur adipisicing elit. Magni, iste, amet consequatur a veniam.

+

YO YOY Lorem ipsum dolor sit amet, consectetur adipisicing elit. Magni, iste, amet consequatur a veniam.

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut optio nulla et, fugiat. Maiores accusantium nostrum asperiores provident, quam modi ex inventore dolores id aspernatur architecto odio minima perferendis, explicabo. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima quos quasi itaque beatae natus fugit provident delectus, magnam laudantium odio corrupti sit quam. Optio aut ut repudiandae velit distinctio asperiores?

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reprehenderit repellendus natus, sint ea optio dignissimos asperiores inventore a molestiae dolorum placeat repellat excepturi mollitia ducimus unde doloremque ad, alias eos!