Merge pull request #544 from DFurnes/forge-6.7-last-call

Forge 6.7: Last Call
DoSomethingArchive · Apr 4, 2016 · 1fbc20c · 1fbc20c
2 parents ad6735f + 8647193
commit 1fbc20c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/scss/_components/_heading.scss b/scss/_components/_heading.scss
@@ -58,7 +58,6 @@ h1, h2, h3, h4, h5, h6,
 .heading.-emphasized {
   color: $black;
   text-transform: uppercase;
-  padding: 0 0 $base-spacing;
   overflow: hidden;
   margin: 0;
 

diff --git a/scss/_modules/_figure.scss b/scss/_modules/_figure.scss
@@ -98,7 +98,7 @@
 
 .figure__media {
   text-align: center;
-  margin: 0 auto gutter() / 2;
+  margin: 0 auto gutter();
 
   img {
     margin: 0 auto;

diff --git a/scss/_modules/_tile.scss b/scss/_modules/_tile.scss
@@ -80,7 +80,7 @@
 
   .tile__flag {
     color: #000;
-    font-size: $font-smaller;
+    font-size: $font-small;
     font-weight: $weight-sbold;
     left: 0;
     line-height: 1;

diff --git a/scss/_regions/_container.scss b/scss/_regions/_container.scss
@@ -50,7 +50,8 @@
     .container__block {
       // When inside a container wrapper, increase top/bottom padding
       // on the container body.
-      padding: $base-spacing gutters();
+      padding: 0 gutters();
+      margin: $base-spacing 0;
       line-height: $comfortable-line-height;
 
       &.-narrow {
@@ -72,6 +73,11 @@
   // Use container rows to separate rows in columned layouts.
   .container__row {
     @include clearfix;
+    margin: $base-spacing 0;
+
+    > .container__block {
+      margin: 0;
+    }
   }
 
   // Use container body for all container content, with optional modifiers

diff --git a/scss/_regions/_footer.scss b/scss/_regions/_footer.scss
@@ -162,7 +162,7 @@
 
   a {
     display: block;
-    font-size: $font-smaller;
+    font-size: $font-small;
     color: $med-gray;
     padding: ($base-spacing / 4) 0;
 
@@ -178,7 +178,7 @@
 
 .footer__subfooter {
   clear: both;
-  font-size: $font-smaller;
+  font-size: $font-small;
   border-top: 1px solid $dark-gray;
   padding: ($base-spacing / 2);
 

diff --git a/scss/_regions/_navigation.scss b/scss/_regions/_navigation.scss
@@ -231,7 +231,7 @@
   }
 
   .navigation__subtitle {
-    font-size: $font-smaller;
+    font-size: $font-small;
     opacity: 0.8;
 
     @include media($tablet) {

diff --git a/scss/_utilities/_variables.scss b/scss/_utilities/_variables.scss
@@ -87,7 +87,7 @@ $font-large: type-scale(2); // 28.125px
 $font-medium: type-scale(1); // 22.500px
 $font-regular: type-scale(0); // 18.000px
 $font-small: type-scale(-1); // 14.400px
-$font-smaller: type-scale(-2); // 11.520px
+$font-smaller: $font-small; // DEPRECATED: Use $font-small.
 
 $base-font-size: $font-regular;
 $unitless-line-height: 1.4444444;