moved typography variables in to typography.scss

diff --git a/scss/_global.scss b/scss/_global.scss
index 30b521605024d514e68276d956bd6670d961fdd4..5457f20f67b432ed39c6d8b3525e68c61e7d2693 100755 (executable)
--- 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 81bb40a9e9dfbe70d204a893c1aed2efd1d00733..7b8250e012f6f9c4d5b835d3c98aa0dd25897274 100755 (executable)
--- 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 9a39cb1bbf71f796037c16e59bfb01e0aaeee99b..df65455342c2895bc50a51139e85b8fa3e2bb735 100644 (file)
--- a/test/visual/pages/basic.html
+++ b/test/visual/pages/basic.html
@@ -16,11 +16,11 @@
     <columns>
       <br>
       <center>
-        <img src="http://placehold.it/200x50">
+        <img class="hide-for-large" src="http://placehold.it/200x50">
       </center>
       <br>
       <h1>Hi, Susan Calvin</h1>
-      <p class="lead hide-for-large">YO YOY Lorem ipsum dolor sit amet, consectetur adipisicing elit. Magni, iste, amet consequatur a veniam.</p>
+      <p class="lead">YO YOY Lorem ipsum dolor sit amet, consectetur adipisicing elit. Magni, iste, amet consequatur a veniam.</p>
       <p>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?</p>
       <callout class="primary">
         <p>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!</p>