fixes header font weight from overriding global font weight

diff --git a/scss/_global.scss b/scss/_global.scss
index 7916a8ebec5ecb41b09f3a5f789118312e741ebc..81d6684e527f521981b11f2193b0ff646c0d44f2 100755 (executable)
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -96,4 +96,4 @@ $global-rounded: 500px !default;
 
 /// Global media query to switch from desktop to mobile styles.
 /// @type String
-$global-breakpoint: $global-width + $global-gutter;
+$global-breakpoint: $global-width + $global-gutter !default;

diff --git a/scss/components/_alignment.scss b/scss/components/_alignment.scss
index b1ba75557ade7ff256b1a80af41c9282cfd975fb..12a8d79f6126168443e75c3c8b6ec2f9ef3e5444 100755 (executable)
--- a/scss/components/_alignment.scss
+++ b/scss/components/_alignment.scss
@@ -60,6 +60,7 @@ img.float-right {
 img.float-center, 
 img.text-center {
   margin: 0 auto;
+  Margin: 0 auto;
   float: none;
   text-align: center;
 }
@@ -68,6 +69,7 @@ table.float-center,
 td.float-center,
 th.float-center {
   margin: 0 auto;
+  Margin: 0 auto;
   float: none;
   text-align: center;
 }

diff --git a/scss/components/_button.scss b/scss/components/_button.scss
index af6b0ec21c9216070b55f3c502e775f921c6242e..5e2ff913276c283827bc5e04fe3e4139345437b0 100755 (executable)
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@ -72,6 +72,7 @@ $button-padding-large: map-get($button-padding, large);
 
 table.button {
   width: auto !important;
+  margin: $button-margin;
   Margin: $button-margin;
 
   table {

diff --git a/scss/components/_callout.scss b/scss/components/_callout.scss
index 99fff2b42bb5f0ef36ffc36f29926db672a1c399..c5e0b83a434cffea46205d5782a4e191a3b81f0c 100644 (file)
--- a/scss/components/_callout.scss
+++ b/scss/components/_callout.scss
@@ -43,6 +43,8 @@ td.callout {
   border: $callout-border;
   padding: $callout-padding;
   background: $callout-background;
+  margin-bottom: $global-margin;
+  Margin-bottom: $global-margin;
 
   &.primary {
     background: scale-color($primary-color, $lightness: $callout-background-fade);

diff --git a/scss/components/_media-query.scss b/scss/components/_media-query.scss
index d0637249a3c48a7a2d05aaf5b50c50708fe841ea..393ed533f588f0c670813e5b7469f3bb87e58447 100755 (executable)
--- a/scss/components/_media-query.scss
+++ b/scss/components/_media-query.scss
@@ -85,8 +85,9 @@
   @for $i from 1 through ($grid-column-count - 1) {
     table.body td.small-offset-#{$i},
     table.body th.small-offset-#{$i} {
-      //1.5 takes in effect a whole empty cell.
+    //1.5 takes in effect a whole empty cell.
       margin-left: -zf-grid-calc-pct($i, $grid-column-count) !important;
+      Margin-left: -zf-grid-calc-pct($i, $grid-column-count) !important;
     }
   }
 

diff --git a/scss/components/_normalize.scss b/scss/components/_normalize.scss
index 66e432630e14bce8ab532bcedef4bafd5cc505b6..34cdc3e57772fbf3d7ef2e3ed5b86c4fc31323c9 100755 (executable)
--- a/scss/components/_normalize.scss
+++ b/scss/components/_normalize.scss
@@ -18,6 +18,7 @@ body {
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
   margin: 0;
+  Margin: 0;
   padding: 0;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -39,6 +40,7 @@ body {
 
 #backgroundTable {
   margin: 0;
+  Margin: 0;
   padding: 0;
   width: 100% !important;
   line-height: 100% !important;
@@ -66,6 +68,7 @@ a img {
 
 p {
   margin: 0 0 0 $paragraph-margin-bottom;
+  Margin: 0 0 0 $paragraph-margin-bottom;
 }
 
 table {

diff --git a/scss/components/_type.scss b/scss/components/_type.scss
index 41a8c3015d32ba38c02f847f7f755eda277689b2..257ada33d95da2ead3fd43c395f1baf2db270023 100755 (executable)
--- a/scss/components/_type.scss
+++ b/scss/components/_type.scss
@@ -152,9 +152,10 @@ th,
 a {
   color: $global-font-color;
   font-family: $body-font-family;
-  font-weight: $header-font-weight;
+  font-weight: $global-font-weight;
   padding: 0;
   margin: 0;
+  Margin: 0;
   text-align: left;
   line-height: $global-line-height;
 }
@@ -168,6 +169,8 @@ h6 {
   color: $header-color;
   word-break: normal;
   font-family: $header-font-family;
+  font-weight: $header-font-weight;
+  margin-bottom: $header-margin-bottom;
   Margin-bottom: $header-margin-bottom;
 }
 
@@ -205,6 +208,7 @@ th {
 }
 
 p {
+  margin-bottom: $paragraph-margin-bottom;
   Margin-bottom: $paragraph-margin-bottom;
 
   &.lead {
@@ -213,6 +217,8 @@ p {
   }
 
   &.subheader {
+    margin-top: $subheader-margin-top;
+    margin-bottom: $subheader-margin-bottom;
     Margin-top: $subheader-margin-top;
     Margin-bottom: $subheader-margin-bottom;
     font-weight: $subheader-font-weight;
@@ -260,6 +266,7 @@ h6 a:visited {
 pre {
   background: $light-gray;
   margin: 30px 0;
+  Margin: 30px 0;
 
   code {
     color: $medium-gray;
@@ -285,6 +292,7 @@ hr {
   border-top: 0;
   border-bottom: $hr-border;
   border-left: 0;
+  margin: $hr-margin;
   Margin: $hr-margin;
   clear: both;
 }
@@ -295,6 +303,7 @@ hr {
   line-height: 1;
 
   p + & {
+    margin-top: -16px;
     Margin-top: -16px;
   }
 }

diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index f0a39be3d85ef70ab55a6358edb360473bf04e86..e5a760b76d7fe5e55ff455e5bac4660e5e1d1f5e 100755 (executable)
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -31,6 +31,7 @@ table {
     background: $container-background;
     width: $global-width;
     margin: 0 auto;
+    Margin: 0 auto;
     text-align: inherit;
   }
 
@@ -50,6 +51,7 @@ td.column,
 th.columns,
 th.column {
   margin: 0 auto;
+  Margin: 0 auto;
   padding-left: $global-gutter;
   padding-bottom: $column-padding-bottom;
 }

diff --git a/testing/package.json b/testing/package.json
index 01d87b01d81de3e7d91e1aa2a61de81173b744fa..9c9c866ffed88229aa8e9356f5043db472ea154f 100644 (file)
--- a/testing/package.json
+++ b/testing/package.json
@@ -27,7 +27,7 @@
     "gulp-load-plugins": "^1.1.0",
     "gulp-sass": "^2.1.0",
     "gulp-sourcemaps": "^1.6.0",
-    "inky": "^1.2.0",
+    "inky": "^1.2.2",
     "lazypipe": "^1.0.1",
     "panini": "^1.2.0",
     "rimraf": "^2.3.3",

diff --git a/testing/src/assets/scss/_settings.scss b/testing/src/assets/scss/_settings.scss
index 62d3b86b09c974e9c1e92881bf6269edc393cf74..064e6f1b98a8d14a90caef8dbfd1b1220730a80d 100644 (file)
--- a/testing/src/assets/scss/_settings.scss
+++ b/testing/src/assets/scss/_settings.scss
@@ -73,7 +73,6 @@ $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;

diff --git a/testing/src/assets/scss/app.scss b/testing/src/assets/scss/app.scss
index cc83c983158495ac49ec89854f98b059e10e43e6..26ef0700d2315dce09e257cf6d80c4a0716a3126 100644 (file)
--- a/testing/src/assets/scss/app.scss
+++ b/testing/src/assets/scss/app.scss
@@ -46,7 +46,7 @@
   border-radius: 10px;
 }
 
-.feature-block {
+.feature-callout {
   background: $light-gray;
   Margin-bottom: $global-padding * 2;
 
@@ -105,3 +105,4 @@
 }
 
 
+

diff --git a/testing/src/pages/kitcat.html b/testing/src/pages/kitcat.html
index edafd5c8bcdd143f6ca345a8dcc22c61e8bcb5a5..069693ad669a930545fd29a09e6439da982ab923 100644 (file)
--- a/testing/src/pages/kitcat.html
+++ b/testing/src/pages/kitcat.html
@@ -21,7 +21,7 @@
   <row>
     <columns small="12" large="12">
       <center>
-        <img class="float-center" src="http://placehold.it/450x250" alt="">
+        <img src="http://placehold.it/450x250" alt="">
       </center>
     </columns>
   </row>
@@ -32,7 +32,7 @@
       <p class="text-center">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
       quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
       <center>
-        <button class="primary tiny" href="http://zurb.com">Find out more</button>
+        <button class="primary small" href="http://zurb.com">Find out more</button>
       </center>
     </columns>
   </row>