audits settings file to match sites settings

diff --git a/gulpfile.js b/gulpfile.js
index 3e9e818281a3d1214a1192cb01a02d39a4738b70..6eb1786af11241eff798227d79f78e1e6d8fcdab 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -77,7 +77,7 @@ gulp.task('settings', function() {
   octophant('scss/**/*.scss', {
     title: 'Foundation for Emails Settings',
     output: 'testing/src/assets/scss/_settings.scss',
-    sort: ['global', 'grid']
+    sort: ['global', 'grid', 'block-grid', 'media-query', 'type']
   });
 });
 

diff --git a/package.json b/package.json
index 6beb46c61c3ee2ef2be2d6d42b932d0ade9eb93b..617c2d5f1c4bcb66255782a7c55dbda987d6abcd 100644 (file)
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "gulp-webserver": "^0.9.1",
     "handlebars": "^3.0.3",
     "highlight.js": "^8.7.0",
-    "inky": "^1.1.0",
+    "inky": "^1.2.1",
     "lazypipe": "^1.0.1",
     "marked": "^0.3.5",
     "media-query-extractor": "^0.1.1",

diff --git a/scss/_global.scss b/scss/_global.scss
index 420133eb4c5c776d21804a1d5ac6dcdc38e378c6..1522ab46455c02e508a0dd06b09925a5f0986f97 100755 (executable)
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -65,11 +65,3 @@ $global-radius: 3px !default;
 /// Global rounded radius of rounded-corners.
 /// @type Number
 $global-rounded: 500px !default;
-
-/// Default gutter for the grid system
-/// @type Number
-$grid-column-gutter: 16px;
-
-/// Margin bottom of paragraphs.
-/// @type Number
-$paragraph-margin-bottom: 10px !default;

diff --git a/scss/components/_button.scss b/scss/components/_button.scss
index a0c27336b36ebab71d930f3fff835c80183142b0..9ca0ee7fce41224a7631c87a8e84ee50077d4b8e 100755 (executable)
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@ -72,7 +72,7 @@ table.button {
       border: 2px solid $button-background;
 
       a {
-        font-family: $global-font-family;
+        font-family: body-font-family;
         font-size: $button-font-size-default;
         font-weight: $button-font-weight;
         color: $button-color;

diff --git a/scss/components/_callout.scss b/scss/components/_callout.scss
index 17e1c8cf4838ccc3f8ecd9f1bb33dc9f81a20bd6..3b4b063d60a6ed5a48900a14be415b4e4adade03 100644 (file)
--- a/scss/components/_callout.scss
+++ b/scss/components/_callout.scss
@@ -8,7 +8,7 @@
 
 /// Background color of a callout.
 /// @type Color
-$callout-background: $light-gray !default;
+$callout-background: $white !default;
 
 /// Padding inside a callout.
 /// @type Length
@@ -18,6 +18,10 @@ $callout-padding: 10px !default;
 /// @type Border
 $callout-border: 1px solid darken($callout-background, 20%) !default;
 
+/// Border around a callout with the `.success` class.
+/// @type Border
+$callout-border-secondary: 1px solid darken($secondary-color, 20%) !default;
+
 /// Border around a callout with the `.success` class.
 /// @type Border
 $callout-border-success: 1px solid darken($success-color, 20%) !default;
@@ -36,6 +40,12 @@ td.callout {
   padding: $callout-padding !important;
   background: $callout-background;
 
+  &.secondary {
+    background: $secondary-color !important;
+    border: $callout-border-secondary !important;
+    color: $black !important;
+  }
+
   &.success {
     background: $success-color !important;
     border: $callout-border-success !important;

diff --git a/scss/components/_thumbnail.scss b/scss/components/_thumbnail.scss
index bdf636bacd723d3d9355d87947d081866c08644f..7dd7dc04cc1a51f604999e2da1f339c5f2e05d55 100644 (file)
--- a/scss/components/_thumbnail.scss
+++ b/scss/components/_thumbnail.scss
@@ -8,7 +8,7 @@
 
 /// Box shadow for thumbnails. **The color must be an RGB or RGBA value.**
 /// @type Shadow
-$thumbnail-shadow: 0 0 6px 1px rgba($primary-color, 0.5) !default;
+$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2) !default;
 
 .thumbnail {
   display: inline-block;

diff --git a/scss/components/_type.scss b/scss/components/_type.scss
index e038aa703379c1672a5d07d3c967ba71b2ff2b30..d51cc89fd380426a7263180a909ce57e1c25d98c 100755 (executable)
--- a/scss/components/_type.scss
+++ b/scss/components/_type.scss
@@ -12,7 +12,7 @@ $global-font-color: $black !default;
 
 /// Global font family.
 /// @type Font
-$global-font-family: Helvetica, Arial, sans-serif !default;
+$body-font-family: Helvetica, Arial, sans-serif !default;
 
 /// Global font weight.
 /// @type Keyword
@@ -34,6 +34,10 @@ $body-line-height: 19px !default;
 /// @type List
 $header-font-family: $global-font-family !default;
 
+/// Font family of headings.
+/// @type List
+$header-font-weight: $global-font-weight !default;
+
 /// Font size of `<h1>` elements.
 /// @type Number
 $h1-font-size: 40px !default;
@@ -58,6 +62,10 @@ $h5-font-size: 24px !default;
 /// @type Number
 $h6-font-size: 20px !default;
 
+/// Margin bottom of paragraphs.
+/// @type Number
+$paragraph-margin-bottom: 10px !default;
+
 /// Defualt font size for `<small>`.
 /// @type Number
 $small-font-size: 10px !default;
@@ -107,8 +115,8 @@ td,
 th,
 a {
   color: $global-font-color;
-  font-family: $global-font-family;
-  font-weight: $global-font-weight;
+  font-family: $body-font-family;
+  font-weight: $header-font-weight;
   padding: 0;
   margin: 0;
   text-align: left;
@@ -221,3 +229,4 @@ pre {
     }
   }
 }
+

diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index 3c8bedd51cf93ac0aaaf11710ea60f8eddcda237..1aa6b378d1dca5b449c75aa83535fb74ef53f88c 100755 (executable)
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -18,6 +18,10 @@ $wrapper-padding-top: 10px !default;
 /// @type Number
 $column-padding-bottom: 10px !default;
 
+/// Default gutter for the grid system
+/// @type Number
+$grid-column-gutter: 16px !default;
+
 /// Default padding for the right of a sub-column.
 /// @type Number
 $sub-column-padding-right: $grid-column-gutter / 2 !default;

diff --git a/testing/src/assets/scss/_settings.scss b/testing/src/assets/scss/_settings.scss
index ba6606548d9dc7bbf7c93943a900d9b5320532cf..31332550685b0d99fffde5eec6838e48da03beaf 100644 (file)
--- a/testing/src/assets/scss/_settings.scss
+++ b/testing/src/assets/scss/_settings.scss
@@ -19,30 +19,32 @@
 // ---------
 
 $primary-color: #2199e8;
-$secondary-color: #777;
+$secondary-color: #777777;
 $success-color: #3adb76;
 $warning-color: #ffae00;
 $alert-color: #ec5840;
-$light-gray: #f3f3f3;
+$light-gray: #e6e6e6;
 $medium-gray: #cacaca;
 $dark-gray: #8a8a8a;
 $black: #0a0a0a;
 $white: #fefefe;
 $pre-color: #ff6908;
+$body-background: $white;
 $container-width: 580px;
 $container-background-color: $white;
 $global-radius: 3px;
 $global-rounded: 500px;
-$grid-column-gutter: 16px;
 $paragraph-margin-bottom: 10px;
 
 // 2. Grid
 // -------
 
 $grid-column-count: 12;
+$grid-column-gutter: 16px;
 $wrapper-padding-top: 10px;
 $column-padding-bottom: 10px;
 $sub-column-padding-right: $grid-column-gutter / 2;
+$body-background-color: #eeeeee;
 
 // 3. Block Grid
 // -------------
@@ -66,7 +68,7 @@ $button-font-size: (
   large: 20px,
 );
 $button-color: $white;
-$button-color-alt: $medium-gray;
+$button-color-alt: $black;
 $button-font-weight: bold;
 $button-background: $primary-color;
 $button-border: 2px solid $button-background;
@@ -102,28 +104,27 @@ $hr-height: 1px;
 // 9. Thumbnial
 // ------------
 
-$thumbnail-shadow: 0 0 6px 1px rgba($primary-color, 0.5);
+$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2);
 
 // 10. Typography
 // --------------
 
 $global-font-color: $black;
-$global-font-family: Helvetica, Arial, sans-serif;
+$body-font-family: Helvetica, Arial, sans-serif;
 $global-font-weight: normal;
 $global-line-height: 1.3;
 $body-font-size: 14px;
 $body-line-height: 19px;
-$header-font-family: $global-font-family;
-$h1-font-size: 38px;
-$h2-font-size: 34px;
-$h3-font-size: 28px;
-$h4-font-size: 24px;
-$h5-font-size: 20px;
-$h6-font-size: 16px;
+$header-font-family: $body-font-family;
+$h1-font-size: 40px;
+$h2-font-size: 36px;
+$h3-font-size: 32px;
+$h4-font-size: 28px;
+$h5-font-size: 24px;
+$h6-font-size: 20px;
 $small-font-size: 10px;
 $lead-font-size: 18px;
 $lead-line-height: 21px;
-$text-padding: 10px;
 $anchor-text-decoration: none;
 $anchor-color: $primary-color;
 $anchor-color-visited: $anchor-color;