_columns.scss in singularitygs-1.2.0.rc.1

- old
+ new

@@ -1,23 +1,24 @@
 //////////////////////////////
 // Find width, in percentages, of the column span
 //////////////////////////////
-@function column-span($span, $location, $grid: false, $gutter: false, $gutter-style: false) {
+@function column-span($span, $location, $grid: null, $gutter: null, $gutter-style: null) {
 
   // Find the grid and gutters
   $grid: find-grid($grid);
   $gutter: find-gutter($gutter);
+  $gutter-style: find-gutter-style($gutter-style);
 
   @if fixed-gutter($grid, $gutter, $gutter-style) {
     $gutter: 0;
   }
 
   // @debug $grid;
   // @debug $gutter;
 
   // Combine the grid and gutters
-  $grid-and-gutters: column-sum($grid, $gutter);
+  $grid-and-gutters: column-sum($grid, $gutter, $gutter-style);
 
   // @debug $grid-and-gutters;
 
   // Equal width grid are easy! Deal with them!
   @if type-of($grid) == 'number' or length($grid) == 1 {
@@ -50,11 +51,11 @@
 }
 
 //////////////////////////////
 // Find the total sum of the grid
 //////////////////////////////
-@function column-sum($grid, $gutter) {
-  $split: if(index(find-gutter-style(), split), true, false);
+@function column-sum($grid, $gutter, $gutter-style) {
+  $split: if(index($gutter-style, 'split'), true, false);
 
   @if type-of($grid) == 'number' or length($grid) == 1 {
     @if $split {
       @return nth($grid, 1) + ((column-count(nth($grid, 1))) * nth($gutter, 1));
     }
\ No newline at end of file