updates settings file

diff --git a/testing/src/assets/scss/_settings.scss b/testing/src/assets/scss/_settings.scss
index 31332550685b0d99fffde5eec6838e48da03beaf..f8c21f022b62337f36feef66e46bb7bebdbf8be0 100644 (file)
--- a/testing/src/assets/scss/_settings.scss
+++ b/testing/src/assets/scss/_settings.scss
@@ -6,43 +6,41 @@
 //   1. Global
 //   2. Grid
 //   3. Block Grid
-//   4. Button
-//   5. Callout
-//   6. Inline List
-//   7. Media Query
-//   8. Normalize
-//   9. Thumbnial
-//  10. Typography
+//   4. Media Query
+//   5. Typography
+//   6. Button
+//   7. Callout
+//   8. Inline List
+//   9. Normalize
+//  10. Thumbnial
 
 
 // 1. Global
 // ---------
 
 $primary-color: #2199e8;
-$secondary-color: #777777;
+$secondary-color: #777;
 $success-color: #3adb76;
 $warning-color: #ffae00;
 $alert-color: #ec5840;
-$light-gray: #e6e6e6;
+$light-gray: #f3f3f3;
 $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;
-$paragraph-margin-bottom: 10px;
 
 // 2. Grid
 // -------
 
 $grid-column-count: 12;
-$grid-column-gutter: 16px;
 $wrapper-padding-top: 10px;
 $column-padding-bottom: 10px;
+$grid-column-gutter: 16px;
 $sub-column-padding-right: $grid-column-gutter / 2;
 $body-background-color: #eeeeee;
 
@@ -52,7 +50,41 @@ $body-background-color: #eeeeee;
 $block-grid-max: 8;
 $block-grid-gutter: $grid-column-gutter;
 
-// 4. Button
+// 4. Media Query
+// --------------
+
+$container-width-small: 95%;
+$small-range: $container-width;
+
+// 5. Typography
+// -------------
+
+$global-font-color: $black;
+$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;
+$header-font-weight: $global-font-weight;
+$h1-font-size: 40px;
+$h2-font-size: 36px;
+$h3-font-size: 32px;
+$h4-font-size: 28px;
+$h5-font-size: 24px;
+$h6-font-size: 20px;
+$paragraph-margin-bottom: 10px;
+$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;
+$anchor-color-hover: darken($primary-color, 10%);
+$anchor-color-active: $anchor-color-hover;
+
+// 6. Button
 // ---------
 
 $button-padding: (
@@ -68,66 +100,36 @@ $button-font-size: (
   large: 20px,
 );
 $button-color: $white;
-$button-color-alt: $black;
+$button-color-alt: $medium-gray;
 $button-font-weight: bold;
 $button-background: $primary-color;
 $button-border: 2px solid $button-background;
 
-// 5. Callout
+// 7. Callout
 // ----------
 
-$callout-background: $light-gray;
+$callout-background: $white;
 $callout-padding: 10px;
 $callout-border: 1px solid darken($callout-background, 20%);
+$callout-border-secondary: 1px solid darken($secondary-color, 20%);
 $callout-border-success: 1px solid darken($success-color, 20%);
 $callout-border-warning: 1px solid darken($warning-color, 20%);
 $callout-border-alert: 1px solid darken darken($alert-color, 20%);
 
-// 6. Inline List
+// 8. Inline List
 // --------------
 
 $menu-item-padding: 20px;
 $menu-simple-item-spacing: 10px;
 
-// 7. Media Query
-// --------------
-
-$container-width-small: 95%;
-$small-range: $container-width;
-
-// 8. Normalize
+// 9. Normalize
 // ------------
 
 $hr-background: $medium-gray;
 $hr-height: 1px;
 
-// 9. Thumbnial
-// ------------
+// 10. Thumbnial
+// -------------
 
 $thumbnail-shadow: 0 0 0 1px rgba($black, 0.2);
 
-// 10. Typography
-// --------------
-
-$global-font-color: $black;
-$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: $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;
-$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;
-