Prefix utility functions with -zf- to mark them as private

diff --git a/scss/components/_media-query.scss b/scss/components/_media-query.scss
index 095dced70e293a8d00cb3a05741cffd44c647ec3..12035df83722a1fefce4cbfee06dbd85bc0f13d9 100755 (executable)
--- a/scss/components/_media-query.scss
+++ b/scss/components/_media-query.scss
@@ -55,7 +55,7 @@ $small-range: $container-width !default;
     td.small-#{$i},
     th.small-#{$i} {
       display: inline-block !important;
-      width: grid-calc-pct($i, $grid-column-count) !important;
+      width: -zf-grid-calc-pct($i, $grid-column-count) !important;
     }
   }
 
@@ -80,7 +80,7 @@ $small-range: $container-width !default;
     .body .column th.small-#{$i},
     th.small-#{$i} center {
       display: inline-block !important;
-      width: grid-calc-pct($i, $grid-column-count) !important;
+      width: -zf-grid-calc-pct($i, $grid-column-count) !important;
     }
   }
 
@@ -88,7 +88,7 @@ $small-range: $container-width !default;
     table.body td.small-offset-#{$i},
     table.body th.small-offset-#{$i} {
       //1.5 takes in effect a whole empty cell.
-      margin-left: grid-calc-pct($i, $grid-column-count) !important;
+      margin-left: -zf-grid-calc-pct($i, $grid-column-count) !important;
     }
   }
 

diff --git a/scss/grid/_block-grid.scss b/scss/grid/_block-grid.scss
index 1a37c6a62e9abe465edf7584ca5561b2d4c5775a..b1c24646615c423212605662b8c86e0cd349cce4 100755 (executable)
--- a/scss/grid/_block-grid.scss
+++ b/scss/grid/_block-grid.scss
@@ -14,15 +14,6 @@ $block-grid-max: 8 !default;
 /// @type Number
 $block-grid-gutter: $grid-column-gutter !default;
 
-///Creates all of the block-grid classes.
-@mixin block-grid {
-  @for $i from 2 through $block-grid-max {
-    .up-#{$i} td {
-      width: floor(($container-width - $i * $block-grid-gutter) / $i) !important;
-    }
-  }
-}
-
 .block-grid {
   width: 100%;
   max-width: $container-width;
@@ -33,4 +24,9 @@ $block-grid-gutter: $grid-column-gutter !default;
   }
 }
 
-@include block-grid();
+// Sizing classes
+@for $i from 2 through $block-grid-max {
+  .up-#{$i} td {
+    width: floor(($container-width - $i * $block-grid-gutter) / $i) !important;
+  }
+}

diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index 11e1a94a030d6e6b294fd321926b4db143de6ab4..3e2945eefd6141206479d2e3ca85ba4df7eecc0c 100755 (executable)
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -63,7 +63,7 @@ th.column.last {
 @for $i from 1 through $grid-column-count {
   td.large-#{$i},
   th.large-#{$i} {
-    width: grid-calc-px($i, $grid-column-count, $container-width);
+    width: -zf-grid-calc-px($i, $grid-column-count, $container-width);
     padding-left: $grid-column-gutter / 2;
     padding-right: $grid-column-gutter / 2;
   }
@@ -84,7 +84,7 @@ th.column.last {
     th.large-#{$i} {
       padding-right: 0;
       padding-left: 0;
-      width: grid-calc-px($i, $grid-column-count, $container-width) + $grid-column-gutter;
+      width: -zf-grid-calc-px($i, $grid-column-count, $container-width) + $grid-column-gutter;
     }
 
     //Gotta give it that extra love for the first and last columns.
@@ -92,14 +92,14 @@ th.column.last {
     th.large-#{$i}.first,
     td.large-#{$i}.last,
     th.large-#{$i}.last {
-      width: grid-calc-px($i, $grid-column-count, $container-width) + ($grid-column-gutter * 1.5);
+      width: -zf-grid-calc-px($i, $grid-column-count, $container-width) + ($grid-column-gutter * 1.5);
     }
   }
 }
 
 @for $i from 1 through $grid-column-count {
   td.large-#{$i} center {
-    min-width: grid-calc-px($i, $grid-column-count, $container-width);
+    min-width: -zf-grid-calc-px($i, $grid-column-count, $container-width);
   }
 }
 
@@ -108,7 +108,7 @@ th.column.last {
   .body .column td.large-#{$i},
   .body .columns th.large-#{$i},
   .body .column th.large-#{$i} {
-    width: grid-calc-pct($i, $grid-column-count);
+    width: -zf-grid-calc-pct($i, $grid-column-count);
   }
 }
 
@@ -116,7 +116,7 @@ th.column.last {
   td.large-offset-#{$i},
   th.large-offset-#{$i} {
     //1.5 takes in effect a whole empty cell.
-    padding-left: grid-calc-px($i, $grid-column-count, $container-width) + 1.5 * $grid-column-gutter;
+    padding-left: -zf-grid-calc-px($i, $grid-column-count, $container-width) + 1.5 * $grid-column-gutter;
   }
 }
 

diff --git a/scss/util/_util.scss b/scss/util/_util.scss
index 29299b1325609797364d0b7b8093f0d11ad8f1c6..afa2abaeb383b1a5b579c89a27dd3f64251eb67a 100755 (executable)
--- a/scss/util/_util.scss
+++ b/scss/util/_util.scss
@@ -7,7 +7,7 @@
 /// @param {number} $colNumber - Column count of the column.
 /// @param {number} $totalColumns - Column count of the entire row.
 /// @returns {number} A percentage width value.
-@function grid-calc-pct($colNumber, $totalColumns) {
+@function -zf-grid-calc-pct($colNumber, $totalColumns) {
   @return floor(percentage(($colNumber / $totalColumns)) * 1000000) / 1000000;
 }
 
@@ -17,6 +17,6 @@
 /// @param {number} $totalColumns - Column count of the entire row.
 /// @param {number} $containerWidth - Width of the surrounding container, in pixels.
 /// @returns {number} A pixel width value.
-@function grid-calc-px($columnNumber, $totalColumns, $containerWidth) {
+@function -zf-grid-calc-px($columnNumber, $totalColumns, $containerWidth) {
   @return ($containerWidth / $totalColumns * $columnNumber - $grid-column-gutter);
 }