Variable name change

scss/_vars.scss

@@ -7,7 +7,7 @@ $base-background-colour: #fff;
 $base-font-stack:        'Helvetica Neue', Helvetica, Arial, sans-serif;
 $base-font-size:         16;
 $base-line-height:       1.5;
-$base-margin-bottom:     ($base-font-size * $base-line-height) * 1px;
+$base-spacing-unit:      ($base-font-size * $base-line-height) * 1px;
 
 
 /**
@@ -25,7 +25,7 @@ $breakpoint-ld: 2000px;
 
 $grid-max-width:    1200px;
 $grid-grid-columns: 12;
-$grid-gutter:       $base-margin-bottom;
+$grid-gutter:       $base-spacing-unit;
 
 
 /**

scss/base/_forms.scss

@@ -6,8 +6,8 @@ textarea {
   color: $base-colour;
   display: inline-block;
   font: inherit;
-  line-height: $base-margin-bottom;
-  padding: ($base-margin-bottom / 4);
+  line-height: $base-spacing-unit;
+  padding: ($base-spacing-unit / 4);
   width: 100%;
 }
 
@@ -24,15 +24,15 @@ label {
 }
 
 select {
-  height: ($base-margin-bottom * 1.5);
+  height: ($base-spacing-unit * 1.5);
 }
 
 textarea {
-  min-height: ($base-margin-bottom * 4);
+  min-height: ($base-spacing-unit * 4);
 }
 
 .form__group {
-  margin-bottom: $base-margin-bottom;
+  margin-bottom: $base-spacing-unit;
   .form__group__controls {
     @extend .clearfix;
     label {

scss/base/_normalise.scss

@@ -1,11 +1,3 @@
-*,
-*:before,
-*:after {
-  box-sizing: border-box;
-  font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-}
-
 html {
   background-color: $base-background-colour;
   color: $base-colour;
@@ -28,7 +20,7 @@ p,
 hr, 
 ul, 
 ol {
-  margin-bottom: $base-margin-bottom;
+  margin-bottom: $base-spacing-unit;
 }
 
 h1, 
@@ -37,7 +29,7 @@ h3,
 h4, 
 h5, 
 h6 {
-  line-height: $base-margin-bottom;
+  line-height: $base-spacing-unit;
 }
 
 h1, 
@@ -53,7 +45,7 @@ th {
 
 ul, 
 ol {
-  margin-left: $base-margin-bottom;
+  margin-left: $base-spacing-unit;
 }
 
 ul ul, 
@@ -69,7 +61,7 @@ img {
 
 blockquote {
   font-family: serif;
-  padding-left: $base-margin-bottom;
+  padding-left: $base-spacing-unit;
 }
 
 em {
@@ -87,7 +79,7 @@ table {
   width: 100%;
   th,
   td {
-    padding: ($base-margin-bottom / 4);
+    padding: ($base-spacing-unit / 4);
     text-align: left;
   }
 }

scss/generic/_reset.scss

@@ -1,63 +1,11 @@
-/*
- * HTML5 Reset
- 
- * This is a slimmed down version of the following:
- * http://html5doctor.com/html-5-reset-stylesheet
- */
-
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
+* {
   border: 0;
+  box-sizing: border-box;
   font-size: 100%;
-  font: inherit;
-  margin: 0;
-  padding: 0;
-  vertical-align: baseline;
-}
-
-article, 
-aside, 
-details, 
-figcaption, 
-figure, 
-footer, 
-header, 
-hgroup, 
-menu, 
-nav, 
-section, 
-main {
-  display: block;
-}
-
-address, 
-caption, 
-cite, 
-dfn, 
-th, 
-var {
+  font-smoothing: antialiased;
   font-style: normal;
   font-weight: normal;
-}
-
-blockquote, q {
-  quotes: none;
-}
-
-blockquote,
-q {
-  &:before,
-  &:after {
-    content: '';
-    content: none;
-  }
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-th {
-  font-weight: bold;
-  text-align: left;
+  margin: 0;
+  padding: 0;
+  text-rendering: optimizeLegibility;
 }

scss/generic/_utilities.scss

@@ -7,7 +7,7 @@
 }
 
 img.alignleft {
-  margin-right: $base-margin-bottom;
+  margin-right: $base-spacing-unit;
 }
 
 .alignright {
@@ -15,7 +15,7 @@ img.alignleft {
 }
 
 img.alignright {
-  margin-left : $base-margin-bottom;
+  margin-left : $base-spacing-unit;
 }
 
 .aligncenter {
@@ -27,7 +27,7 @@ img.alignright {
 }
 
 img.aligncenter {
-  margin-bottom: $base-margin-bottom;
+  margin-bottom: $base-spacing-unit;
 }
 
 

scss/modules/_buttons.scss

@@ -6,9 +6,9 @@
   display: inline-block;
   font: inherit;
   font-weight: bold;
-  height: ($base-margin-bottom * 1.5);
-  line-height: ($base-margin-bottom * 1.5);
-  padding: 0 $base-margin-bottom;
+  height: ($base-spacing-unit * 1.5);
+  line-height: ($base-spacing-unit * 1.5);
+  padding: 0 $base-spacing-unit;
   text-align: center;
   width: auto;
   &::-moz-focus-inner {