Move $global-gutter from _grid.scss to _global.scss

diff --git a/scss/_global.scss b/scss/_global.scss
index f7ba60b8d39a85966bf2d8dae89a748e450971a1..2618e10ebf9f87405150a77ccc21c752371d3bb5 100755 (executable)
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -58,6 +58,10 @@ $global-width: 580px !default;
 /// @type Length
 $global-width-small: 95% !default;
 
+/// Gutter for grid elements.
+/// @type length
+$global-gutter: 16px !default;
+
 /// Body background color.
 /// @type Length
 $body-background: $light-gray !default;

diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index 6112a07d5b88c9a655f8bd9fb732f52bafcd2bfd..4e67acbc1bd76a2e3a8638c119eeda6a10e6fca3 100755 (executable)
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -10,10 +10,6 @@
 /// @type Number
 $grid-column-count: 12 !default;
 
-/// Gutter for grid elements.
-/// @type length
-$global-gutter: 16px !default;
-
 /// Default padding for the bottom of a column.
 /// @type Number
 $column-padding-bottom: $global-padding !default;

diff --git a/testing/src/assets/scss/_settings.scss b/testing/src/assets/scss/_settings.scss
index e99bda581cb904a0d733cf8e5c4e0b184075c1c1..aae22d5502b7ff0b22d035e8a8b5e26ab4ea2873 100644 (file)
--- a/testing/src/assets/scss/_settings.scss
+++ b/testing/src/assets/scss/_settings.scss
@@ -29,15 +29,15 @@ $white: #fefefe;
 $pre-color: #ff6908;
 $global-width: 580px;
 $global-width-small: 95%;
+$global-gutter: 16px;
 $body-background: $light-gray;
-$container-background-color: $white;
+$container-background: $white;
 $global-font-color: $black;
 $body-font-family: Helvetica, Arial, sans-serif;
 $global-padding: 16px;
-$global-margin: 16px;
+$global-margin: 32px;
 $global-radius: 3px;
 $global-rounded: 500px;
-$global-gutter: 16px;
 $global-breakpoint: $global-width + $global-gutter;
 
 // 2. Grid
@@ -45,7 +45,6 @@ $global-breakpoint: $global-width + $global-gutter;
 
 $grid-column-count: 12;
 $column-padding-bottom: $global-padding;
-$sub-column-padding-right: $global-gutter / 2;
 
 // 3. Block Grid
 // -------------
@@ -59,7 +58,7 @@ $block-grid-gutter: $global-gutter;
 $global-font-weight: normal;
 $header-color: inherit;
 $global-line-height: 1.3;
-$global-font-size: 16px;
+$global-font-size: 14px;
 $body-line-height: 19px;
 $header-font-family: $body-font-family;
 $header-font-weight: $global-font-weight;