removes unneeded subgrid variable

diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index e196cf4373d452f122c365c5fff700c621cc3728..6112a07d5b88c9a655f8bd9fb732f52bafcd2bfd 100755 (executable)
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -18,10 +18,6 @@ $global-gutter: 16px !default;
 /// @type Number
 $column-padding-bottom: $global-padding !default;
 
-/// Default padding for the right of a sub-column.
-/// @type Number
-$sub-column-padding-right: $global-gutter / 2 !default;
-
 //For viewing email in browser
 html {
   min-height: 100%;

diff --git a/testing/src/assets/scss/_settings.scss b/testing/src/assets/scss/_settings.scss
index b01830ffa70ee00cdcda2b8dbefdb09e00f4cc72..e99bda581cb904a0d733cf8e5c4e0b184075c1c1 100644 (file)
--- a/testing/src/assets/scss/_settings.scss
+++ b/testing/src/assets/scss/_settings.scss
@@ -6,12 +6,11 @@
 //   1. Global
 //   2. Grid
 //   3. Block Grid
-//   4. Thumbnial
-//   5. Typography
-//   6. Button
-//   7. Callout
-//   8. Inline List
-//   9. Normalize
+//   4. Typography
+//   5. Button
+//   6. Callout
+//   7. Menu
+//   8. Thumbnial
 
 
 // 1. Global
@@ -30,25 +29,23 @@ $white: #fefefe;
 $pre-color: #ff6908;
 $global-width: 580px;
 $global-width-small: 95%;
-$global-gutter: 16px;
+$body-background: $light-gray;
 $container-background-color: $white;
+$global-font-color: $black;
+$body-font-family: Helvetica, Arial, sans-serif;
 $global-padding: 16px;
 $global-margin: 16px;
 $global-radius: 3px;
 $global-rounded: 500px;
+$global-gutter: 16px;
 $global-breakpoint: $global-width + $global-gutter;
 
 // 2. Grid
 // -------
 
 $grid-column-count: 12;
-$column-padding-bottom: 16px;
+$column-padding-bottom: $global-padding;
 $sub-column-padding-right: $global-gutter / 2;
-<<<<<<< HEAD
-$body-background: $light-gray;
-=======
-$body-background-color: $light-gray;
->>>>>>> 7a165d7b7ecc2c99b49b0b154c311f520c8a6b74
 
 // 3. Block Grid
 // -------------
@@ -56,19 +53,13 @@ $body-background-color: $light-gray;
 $block-grid-max: 8;
 $block-grid-gutter: $global-gutter;
 
-// 4. Thumbnial
-// ------------
-
-$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2);
-
-// 5. Typography
+// 4. Typography
 // -------------
 
-$global-font-color: $black;
-$body-font-family: Helvetica, Arial, sans-serif;
 $global-font-weight: normal;
+$header-color: inherit;
 $global-line-height: 1.3;
-$global-font-size: 14px;
+$global-font-size: 16px;
 $body-line-height: 19px;
 $header-font-family: $body-font-family;
 $header-font-weight: $global-font-weight;
@@ -78,23 +69,28 @@ $h3-font-size: 32px;
 $h4-font-size: 28px;
 $h5-font-size: 24px;
 $h6-font-size: 20px;
+$header-margin-bottom: 10px;
 $paragraph-margin-bottom: 10px;
 $small-font-size: 10px;
 $lead-font-size: $global-font-size * 1.25;
 $lead-line-height: 1.6;
+$text-padding: 10px;
 $subheader-lineheight: 1.4;
 $subheader-color: $dark-gray;
 $subheader-font-weight: $global-font-weight;
-$subheader-margin-top: 0.2rem;
-$subheader-margin-bottom: 0.5rem;
-$stat-font-size: 2.5rem;
+$subheader-margin-top: 4px;
+$subheader-margin-bottom: 8px;
+$hr-width: $global-width;
+$hr-border: 1px solid $medium-gray;
+$hr-margin: 20px auto;
 $anchor-text-decoration: none;
 $anchor-color: $primary-color;
 $anchor-color-visited: $anchor-color;
 $anchor-color-hover: darken($primary-color, 10%);
 $anchor-color-active: $anchor-color-hover;
+$stat-font-size: 40px;
 
-// 6. Button
+// 5. Button
 // ---------
 
 $button-padding: (
@@ -109,15 +105,16 @@ $button-font-size: (
   default: 16px,
   large: 20px,
 );
-$button-margin: 0 0 $global-margin 0;
 $button-color: $white;
 $button-color-alt: $medium-gray;
 $button-font-weight: bold;
+$button-margin: 0 0 $global-margin 0;
 $button-background: $primary-color;
 $button-border: 2px solid $button-background;
 $button-radius: $global-radius;
+$button-rounded: $global-rounded;
 
-// 7. Callout
+// 6. Callout
 // ----------
 
 $callout-background: $white;
@@ -129,15 +126,14 @@ $callout-border-success: 1px solid darken($success-color, 20%);
 $callout-border-warning: 1px solid darken($warning-color, 20%);
 $callout-border-alert: 1px solid darken($alert-color, 20%);
 
-// 8. Inline List
-// --------------
+// 7. Menu
+// -------
 
 $menu-item-padding: 20px;
 $menu-simple-item-spacing: 10px;
 
-// 9. Normalize
+// 8. Thumbnial
 // ------------
 
-$hr-background: $medium-gray;
-$hr-height: 1px;
+$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2);