gridtacular 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b421dfea294b15cc6b5bf78b4f1511d3bea25e9
-  data.tar.gz: 0457670c28abd10f6b8acbbc59c5a9cd92b6d493
+  metadata.gz: a72e27a507cd1090b3861bf4c76f79670a8a4227
+  data.tar.gz: 34bc465d1a48fdc4a4f8e2ec0e131f2f992a9790
 SHA512:
-  metadata.gz: 1fcff141448594bf632d0e8fbb938a8c3bbce92c7e1bf424f3783d6eb6e7ee18c69f73ae6b04f7ca9f50e77febdda0df829e7ebbcf2d68b9f8d1b4c7c501e02d
-  data.tar.gz: 8553dba6c33143ba93a576ffaed26e24d7b4ff8441b59f8df5cb89cba6eff33054169a1384435bf7623e6bdef05ef9038b700af202cc04ff03b2a748979cd449
+  metadata.gz: 9ad19517ded01f0c6a9e0ef286035d4831bb916fa5aada30ad8dc809b0c138778cc60165f2b6d6d7270a691bf44d8147f5abaeb3ebdcf86aed508694f2e511e4
+  data.tar.gz: 9f0e221bd4a83bd3a69dbba92a6bf0756190b6e00a9f7d1a4b4726f7d627962add7344faec03f8edddd7e9d4f80a50c17aabade4709eb7f5ae857a2016ebdefa

data/_gridtacular.scss

@@ -1,7 +1,7 @@
 //
 // Flexbones Grid System
 // 
-// Version 1.2
+// Version 1.3
 // Author: Rory Ashford
 //
 
@@ -25,9 +25,9 @@
 // 
 // Works out the percent width of columns (gutters can be 
 // any unit but columns are always percent bases)
-@function column-width($number-of-columns,$total-columns) {
-    $single-col-width: 100 / $total-columns * 1%;
-    @return $single-col-width * $number-of-columns;
+@function column-width($number_of_columns,$total_columns) {
+    $single_col_width: 100 / $total_columns * 1%;
+    @return $single_col_width * $number_of_columns;
 }
 
 
@@ -56,8 +56,8 @@
 // 
 // Used to set grids semantically from within 
 // the stylesheet with no additional HTML markup
-@mixin span-columns($columns, $total-columns){
-    width: column-width($columns,$total-columns);
+@mixin span-columns($columns, $total_columns){
+    width: column-width($columns,$total_columns);
     padding-left: $gutter-width; 
 }
 
@@ -93,7 +93,7 @@
 // EXPERIMENTAL (Disabled in current build)
 // feels extremely hacky, doesnt scale particularly well
 // should it be called per media query?
-@mixin grid-equal-height($gutter,$column-name){
+@mixin grid-equal-height($gutter,$column_name){
     .grid--equal-height{
         display: flex;
         flex-wrap: wrap;
@@ -109,7 +109,7 @@
 
 
 // Grid with no gutters
-@mixin grid-no-gutter($column-class,$suffix: null){
+@mixin grid-no-gutter($column_class,$suffix: null){
     .grid--no-gutter#{$suffix}{
         margin-left: 0;
 
@@ -130,7 +130,8 @@
     $fractions: ();
     @for $i from -$numerator through -1{
         @if($numerator % abs($i) == 0 and $denominator % abs($i) == 0){
-            $fractions: map-merge($fractions, abs($i) #{$numerator/abs($i)}-#{$denominator/abs($i)});
+            $fraction: (abs($i): #{$numerator/abs($i)}-#{$denominator/abs($i)});
+            $fractions: map-merge($fractions, $fraction);
         }     
     }
     // return map of all fractions
@@ -144,15 +145,15 @@
 // columns divided by the total number of columns.
 @mixin grid-columns($prefix: null, $suffix: null, $columns: null, $fifths: false, $sevenths: false){
     @for $i from 1 through $columns{
-        $css-classes: equivalent-fractions($i,$columns);
-        $column-class: null;
+        $css_classes: equivalent-fractions($i,$columns);
+        $column_class: null;
         
-        @each $css-class in $css-classes{
-            $column-class: $column-class, 
-            #{ $prefix }#{ value( $css-class ) }#{ $suffix };
+        @each $key, $css_class in $css_classes{
+            $full_css_class: #{$prefix}#{$css-class}#{$suffix};
+            $column_class: $column_class, $full_css_class;
         }
         
-        #{$column-class}{
+        #{$column_class}{
             width: column-width($i,$columns);
         }
     }
@@ -161,7 +162,7 @@
     // doesnt divide into fifths.
     @if($fifths == true){
         @for $i from 1 through 5{
-            $fifth_class: #{$prefix}#{$i}+'-5'+ #{$suffix};
+            $fifth_class: #{$prefix}#{$i}-5#{$suffix};
 
             #{$fifth_class}{
                 width: column-width($i,5);
@@ -173,7 +174,7 @@
     // doesnt divide into fifths.
     @if($sevenths == true){
         @for $i from 1 through 7{
-            $seventh_class: #{$prefix}#{$i}+'-7'+ #{$suffix};
+            $seventh_class: #{$prefix}#{$i}-7#{$suffix};
 
             #{$seventh_class}{
                 width: column-width($i,7);
@@ -189,15 +190,15 @@
 // the column by a maximum number of total-columns -1
 @mixin grid-push($prefix: null, $suffix: null, $columns: null){
     @for $i from 1 through $columns - 1{
-        $css-classes: equivalent-fractions($i,$columns);
-        $push-class: null;
+        $css_classes: equivalent-fractions($i,$columns);
+        $push_class: null;
         
-        @each $css-class in $css-classes{
-            $push-class: $push-class, 
-            #{ $prefix }#{ value($css-class) }#{ $suffix };
+        @each $key, $css_class in $css_classes{
+            $full_css_class: #{$prefix}#{$css_class}#{$suffix};
+            $push_class: $push_class, $full_css_class;
         }
         
-        #{$push-class}{
+        #{$push_class}{
             margin-left: column-width($i,$columns);
         }
     }
@@ -220,7 +221,7 @@
 //
 // Outputs the current breakpoint name to quickly debug 
 // each breakpoint.
-@mixin grid-debug($breakpoint-name,$debug-bg: #000){
+@mixin grid-debug($breakpoint_name,$debug_bg: #000){
     body:after{
         position: fixed;
         display: block;
@@ -243,37 +244,32 @@
 // this way.
 @mixin grid-generate($grid-args){
 
-    // This solution will ONLY work with libsass and 
-    // sass-list-maps polyfill, will add code for 
-    // sass3.3+ support later
+    $grids: map-get($grid_args, grids);
+    $column_name: map-get(map-get($grid_args, config), columnclass);
+    $column_prefix: #{'.' + $column_name};
+    $push_prefix: #{'.' + map-get(map-get($grid_args, config), pushclass)};
+    $debug_display: map-get(map-get($grid_args, config), debug);
 
-    $grids: map-get-z($grid-args, grids);
-    $column-name: map-get-z($grid-args, config, columnclass);
-    $column-prefix: #{'.' + $column-name};
-    $push-prefix: #{'.' + map-get-z($grid-args, config, pushclass)};
-    $debug-display: map-get-z($grid-args, config, debug);
-
-    @each $grid in $grids{
-        $columns:       map-get(value($grid),columns);
-        $suffix:        map-get(value($grid),suffix);
-        $breakpoint:    map-get(value($grid),breakpoint);
-        $gutter:        map-get(value($grid),gutter);
+    @each $grid_name, $grid_map in $grids{
+        $columns:       map-get($grid_map,columns);
+        $suffix:        map-get($grid_map,suffix);
+        $breakpoint:    map-get($grid_map,breakpoint);
+        $gutter:        map-get($grid_map,gutter);
 
         // Debug info
-        $debug-bg:      map-get-z(value($grid),debug,background);
-        $debug-name:    map-get-z(value($grid),debug,name);
+        $debug-bg:      map-get(map-get($grid_map, debug), background);
+        $debug-name:    map-get(map-get($grid_map, debug), name);
 
         // Include the necessary mixins to generate the grids
 
         @include at-breakpoint($breakpoint){
             @include grid($gutter);
-            @include grid-no-gutter($column-name,$suffix);
-            //@include grid-equal-height($gutter,$column-name); //Currently disabled
-            @include grid-columns($column-prefix,$suffix,$columns,true, true);
-            @include grid-push($push-prefix, $suffix, $columns);
-            @include grid-omega($column-prefix, $suffix);
-            @if( $debug-display == true ){ 
-                @include grid-debug($debug-name,$debug-bg) 
+            @include grid-no-gutter($column_name,$suffix);
+            @include grid-columns($column_prefix,$suffix,$columns,true, true);
+            @include grid-push($push_prefix, $suffix, $columns);
+            @include grid-omega($column_prefix, $suffix);
+            @if( $debug_display == true ){ 
+                @include grid-debug($debug_name,$debug_bg) 
             }    
         }    
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridtacular
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Rory Ashford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler