Merge branch 'refactor/properties-order' of git://github.com/ncoden/foundation-sites...

diff --cc scss/_global.scss
Simple merge

diff --cc scss/components/_tabs.scss
Simple merge

diff --cc scss/grid/_flex-grid.scss
index 13575d8c175d4acc6eb29709e2930434f73ee78a,eb854f61fdd5360b7c07845dff5b75398a53301c..2b7aa4dc4f40bef756607b30819366b051cb556d
--- 1/scss/grid/_flex-grid.scss
--- 2/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@@ -193,35 -193,12 +193,35 @@@
  
    // To properly nest a column row, padding and margin is removed
    .row .column.row.row {
-     padding-left: 0;
-     padding-right: 0;
-     margin-left: 0;
      margin-right: 0;
+     margin-left: 0;
+     padding-right: 0;
+     padding-left: 0;
    }
  
 +
 +  .flex-container {
 +    @include flex;
 +  }
 +
 +  .flex-child-auto {
 +    flex: 1 1 auto;
 +  }
 +
 +  .flex-child-grow {
 +    flex: 1 0 auto;
 +  }
 +
 +  .flex-child-shrink {
 +    flex: 0 1 auto;
 +  }
 +
 +  @each $dir, $prop in $-zf-flex-direction {
 +    .flex-dir-#{$dir} {
 +      @include flex-direction($prop);
 +    }
 +  }
 +
    @include -zf-each-breakpoint {
      @for $i from 1 through $grid-column-count {
        // Sizing (percentage)