Merge branch 'feature/2.1' into development

benbrehaut · Aug 13, 2017 · 174eded · 174eded
2 parents 552edf9 + 2d20582
commit 174eded
Show file tree

Hide file tree

Showing 9 changed files with 574 additions and 19 deletions.
diff --git a/assets/css/dist/main.css b/assets/css/dist/main.css
@@ -8,6 +8,31 @@ Author URI:         https://benb.uk/
 License:            MIT License
 License URI:        http://www.opensource.org/licenses/mit-license.php
 */
+.section {
+  width: 100%;
+  float: left; }
+  .section::after, .section::before {
+    content: ' ';
+    display: table;
+    -webkit-flex-basis: 0;
+        -ms-flex-preferred-size: 0;
+            flex-basis: 0;
+    -webkit-box-ordinal-group: 2;
+    -webkit-order: 1;
+        -ms-flex-order: 1;
+            order: 1; }
+  .section::after {
+    clear: both; }
+  .section--default {
+    padding-top: 1.875rem;
+    padding-bottom: 1.875rem; }
+  .section--normal {
+    padding-top: 0.9375rem;
+    padding-bottom: 0.9375rem; }
+  .section--lrg {
+    padding-top: 3.75rem;
+    padding-bottom: 3.75rem; }
+
 ._show-only--small {
   display: none; }
 
@@ -29,7 +54,8 @@ License URI:        http://www.opensource.org/licenses/mit-license.php
   ._show-only--large {
     display: block; } }
 
-._sr-hidden {
+._sr-hidden,
+.screen-reader-response {
   position: absolute !important;
   width: 1px;
   height: 1px;
@@ -1139,6 +1165,12 @@ progress {
 textarea {
   overflow: auto; }
 
+/**
+ * Remove italics from <address> tag
+ */
+address {
+  font-style: normal; }
+
 /**
  * 1. Add the correct box sizing in IE 10-.
  * 2. Remove the padding in IE 10-.
@@ -1543,14 +1575,58 @@ img.size-full {
 .site-footer {
   width: 100%;
   float: left; }
+  .site-footer a {
+    color: inherit; }
+  .site-footer__row {
+    max-width: 1165px;
+    margin-left: auto;
+    margin-right: auto;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+    -webkit-flex-flow: row wrap;
+        -ms-flex-flow: row wrap;
+            flex-flow: row wrap; }
   .site-footer__main {
     padding-top: 1.875rem;
     padding-bottom: 1.875rem; }
   .site-footer__bottom {
     padding-top: 0.9375rem;
     padding-bottom: 0.9375rem; }
   .site-footer__col {
-    width: 50%; }
+    -webkit-box-flex: 0;
+    -webkit-flex: 0 0 33.33333%;
+        -ms-flex: 0 0 33.33333%;
+            flex: 0 0 33.33333%;
+    padding-left: 0.625rem;
+    padding-right: 0.625rem;
+    max-width: 33.33333%; }
+    @media screen and (min-width: 40em) {
+      .site-footer__col {
+        padding-left: 0.9375rem;
+        padding-right: 0.9375rem; } }
+
+.site-footer-nav {
+  list-style: none;
+  margin: 0;
+  padding: 0; }
+
+.site-social {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center; }
+  .site-social__item {
+    display: inline-block; }
+    .site-social__item:not(:first-of-type) {
+      margin-left: 0.5rem; }
 
 .breadcrumbs {
   width: 100%; }

diff --git a/assets/css/dist/main.min.css b/assets/css/dist/main.min.css
diff --git a/assets/scss/abstracts/_helpers.scss b/assets/scss/abstracts/_helpers.scss
@@ -2,6 +2,29 @@
 // :Helpers
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
+// Sections
+// ------------------
+.section {
+  @include clearfix;
+  width: 100%;
+  float: left;
+
+  &--default {
+    padding-top: $spacing-primary;
+    padding-bottom: $spacing-primary;
+  }
+
+  &--normal {
+    padding-top: $spacing-secondary;
+    padding-bottom: $spacing-secondary;
+  }
+
+  &--lrg {
+    padding-top: $spacing-primary * 2;
+    padding-bottom: $spacing-primary * 2;
+  }
+}
+
 // Responsive Classes
 // ------------------
 
@@ -33,7 +56,8 @@
 
 // Accessability
 // ------------------
-._sr-hidden {
+._sr-hidden,
+.screen-reader-response {
   @include element-invisible;
 }
 

diff --git a/assets/scss/abstracts/_variables.scss b/assets/scss/abstracts/_variables.scss
@@ -26,7 +26,15 @@ $palette-success: $green;
 $palette-heading: $dark-grey;
 $palette-paragraph: lighten($palette-primary, 4);
 
-$box-shadow: 0 9px 45px 0 rgba($palette-primary, 0.20);
+// Social Media Colors
+$facebook: #3b5998;
+$twitter: #00aced;
+$pinterest: #cb2027;
+$instagram: linear-gradient(45deg, #f09433 0%,#e6683c 25%,#dc2743 50%,#cc2366 75%,#bc1888 100%);
+$google-plus: #dd4b39;
+$linkedin: #007bb6;
+$youtube: #bb0000;
+$houzz: #7ac142;
 
 // Typography
 // ------------------
@@ -57,6 +65,10 @@ $spacing-tertiary: rem-calc(5);
 // ------------------
 $z-stack: site, skipToContent, mobileMenu, siteOverlay, modal;
 
+// Misc Variables
+// ------------------
+$box-shadow: 0 9px 45px 0 rgba($palette-primary, 0.20);
+
 // Layout & Grid
 // ------------------
 $global-width: 1165px;

diff --git a/assets/scss/base/_reset.scss b/assets/scss/base/_reset.scss
@@ -363,6 +363,13 @@ textarea {
   overflow: auto;
 }
 
+/**
+ * Remove italics from <address> tag
+ */
+address {
+  font-style: normal;
+}
+
 /**
  * 1. Add the correct box sizing in IE 10-.
  * 2. Remove the padding in IE 10-.

diff --git a/assets/scss/partials/_footer.scss b/assets/scss/partials/_footer.scss
@@ -6,6 +6,14 @@
   width: 100%;
   float: left;
 
+  a {
+    color: inherit;
+  }
+
+  &__row {
+    @include flex-grid-row;
+  }
+
   &__main {
     padding-top: $spacing-primary;
     padding-bottom: $spacing-primary;
@@ -17,6 +25,24 @@
   }
 
   &__col {
-    width: 50%;
+    @include flex-grid-column(4);
+  }
+}
+
+// Footer Links
+.site-footer-nav {
+  @include unstyled-list;
+}
+
+.site-social {
+  display: flex;
+  justify-content: center;
+
+  &__item {
+    display: inline-block;
+
+    &:not(:first-of-type) {
+      margin-left: rem-calc(8);
+    }
   }
 }