singularitygs 1.1.2 → 1.2.0.rc.1

data/stylesheets/singularitygs/api/_isolation.scss

@@ -1,161 +1,100 @@
-@mixin output-isolation($span, $location, $columns, $gutter, $options: false) {
+@function output-isolation($Span-Map) {
+  // Set up Left/Right maps
+  $Return: ();
 
-  $gutter: find-gutter($gutter);
-  $gutter-span: gutter-span($gutter, $columns);
-  $end-row: end-row($span, $location, $columns);
-  $start-row: start-row($location);
+  $Span: map-get($Span-Map, 'span');
+  $Location: map-get($Span-Map, 'location');
 
-  $gutter-style: find-gutter-style();
-  $fixed-gutter: fixed-gutter($columns, $gutter);
-  $gutter-property: gutter-property($columns, $gutter);
-  $split: index($gutter-style, split);
+  $Grid: map-get($Span-Map, 'grid');
+  $Gutter: map-get($Span-Map, 'gutter');
+  $Style: map-get($Span-Map, 'style');
 
-  $margin-span: column-span(($location - 1), 1, $columns, $gutter, $gutter-style);
+  $Start-Row: map-get($Span-Map, 'start row');
+  $End-Row: map-get($Span-Map, 'end row');
 
-  @if not $fixed-gutter {
-    $margin-span: $margin-span + $gutter-span;
+  $Fixed-Gutter: map-get($Span-Map, 'fixed gutter');
+  $Split-Gutter: map-get($Span-Map, 'split gutter');
+  $Gutter-Property: map-get($Span-Map, 'gutter property');
+
+  $Direction: map-get($Span-Map, 'direction');
+  $Options: map-get($Span-Map, 'options');
+
+  $Width: column-span($Span, $Location, $Grid, $Gutter, $Style);
+  $Margin-Span: column-span(($Location - 1), 1, $Grid, $Gutter, $Style);
+  $Gutter-Span: gutter-span($Gutter, $Grid);
+
+  // Backwards Compatibility for Options
+  @if type-of($Options) != 'map' and $Options != null {
+    $Options: ('clear': unquote(nth($Options, 1)));
   }
 
+  $Dir: $Direction;
+  $Opp: opposite-direction($Dir);
 
-  @if $direction == 'ltr' or $direction == 'both' {
-    // Set the CSS direction to ltr
-    $cssdir: 'ltr';
-    // Find the CSS named direction and opposite direction
-    $dir: named-direction($cssdir);
-    $opp: opposite-direction($dir);
+  $Return: map-merge($Return, ('width': $Width));
 
-    width: column-span($span, $location, $columns, $gutter, $gutter-style);
+  @if ($End-Row) {
+    $Return: map-merge($Return, ('float': $Opp));
+    $Return: map-merge($Return, ('margin-#{$Dir}': 0));
 
-    // If we are at the last item in the row, we float it the opposite direction
-    @if ($end-row) {
-      float: $opp;
-      margin-#{$dir}: 0;
-      @if $split and not $fixed-gutter {
-	#{$gutter-property}-#{$opp}: $gutter-span / 2;
-      }
-      @else {
-	margin-#{$opp}: 0;
-      }
+    @if $Split-Gutter and not $Fixed-Gutter {
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': $Gutter-Span / 2));
     }
     @else {
-      float: $dir;
-      margin-#{$opp}: -100%;
-
-      @if $start-row {
-	@if $split and not $fixed-gutter {
-	  margin-#{$dir}: $gutter-span / 2;
-	}
-	@else {
-	  margin-#{$dir}: 0%;
-	}
-      }
-      @else {
-	@if $split and not $fixed-gutter {
-	  margin-#{$dir}: $margin-span + $gutter-span / 2;
-	}
-	@else {
-	  margin-#{$dir}: $margin-span;
-	}
-
-      }
+      $Return: map-merge($Return, ('margin-#{$Opp}': 0));
     }
+  }
+  @else {
+    $Return: map-merge($Return, ('float': $Dir));
+    $Return: map-merge($Return, ('margin-#{$Opp}': -100%));
 
-    // If options are set, we clear to that option, otherwise no clear!
-    @if ($options) {
-      clear: unquote($options);
+    @if $Start-Row {
+      @if $Split-Gutter and not $Fixed-Gutter {
+        $Return: map-merge($Return, ('margin-#{$Dir}': $Gutter-Span / 2));
+      }
+      @else if not $Fixed-Gutter {
+        $Return: map-merge($Return, ('margin-#{$Dir}': 0));
+      }
     }
     @else {
-      clear: none;
-    }
-
-    @if $fixed-gutter {
-      @if index($gutter-style, split) {
-	#{$gutter-property}-#{$dir}: $gutter-span / 2;
-	#{$gutter-property}-#{$opp}: $gutter-span / 2;
+      @if $Split-Gutter and not $Fixed-Gutter {
+        $Return: map-merge($Return, ('margin-#{$Dir}': $Margin-Span + $Gutter-Span + $Gutter-Span / 2));
+      }
+      @else if not $Fixed-Gutter {
+        $Return: map-merge($Return, ('margin-#{$Dir}': $Margin-Span + $Gutter-Span));
       }
       @else {
-	#{$gutter-property}-#{$opp}: $gutter-span;
+        $Return: map-merge($Return, ('margin-#{$Dir}': $Margin-Span));
       }
     }
   }
+  // If options are set, we merge them in!
+  @if ($Options) {
+    $Return: map-merge($Return, $Options);
+  }
 
-  @if $direction == 'rtl' or $direction == 'both' {
-    // Set the CSS direction to ltr
-    $cssdir: 'rtl';
-    // Find the CSS named direction and opposite direction
-    $dir: named-direction($cssdir);
-    $opp: opposite-direction($dir);
-
-    [dir="#{$cssdir}"] & {
-      // If we are at the last item in the row, we float it the opposite direction
-      @if ($end-row) {
-        float: $opp;
-	margin-#{$dir}: 0;
-	@if $split and not $fixed-gutter {
-	  #{$gutter-property}-#{$opp}: $gutter-span / 2;
-	}
-	@else {
-	  margin-#{$opp}: 0;
-	}
-      }
-      @else {
-        float: $dir;
-        margin-#{$opp}: -100%;
-
-        @if $start-row {
-	  @if $split and not $fixed-gutter {
-	    margin-#{$dir}: $gutter-span / 2;
-	  }
-	  @else {
-	    margin-#{$dir}: 0%;
-	  }
-        }
-        @else {
-	  @if $split and not $fixed-gutter {
-	    margin-#{$dir}: $margin-span + $gutter-span / 2;
-	  }
-	  @else {
-	    margin-#{$dir}: $margin-span;
-	  }
-
-        }
-      }
+  // If CLear isn't already available, set it!
+  @if not map-has-key($Return, 'clear') {
+    $Return: map-merge($Return, ('clear': none));
+  }
 
-      // If options are set, we clear to that option, otherwise no clear!
-      @if ($options) {
-        clear: unquote($options);
+  // Left Fixed Gutters
+  @if $Fixed-Gutter {
+    @if index($Style, 'split') {
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Dir}': $Gutter-Span / 2));
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': $Gutter-Span / 2));
+    }
+    @else {
+      @if not $End-Row {
+        $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': $Gutter-Span));
       }
       @else {
-        clear: none;
-      }
-
-      @if $fixed-gutter {
-	@if $direction == 'rtl' {
-	  @if index($gutter-style, split) {
-	    #{$gutter-property}-#{$dir}: $gutter-span / 2;
-	    #{$gutter-property}-#{$opp}: $gutter-span / 2;
-	  }
-	  @else {
-	    #{$gutter-property}-#{$opp}: $gutter-span;
-	  }
-	}
-	@else if not index($gutter-style, split) {
-	  #{$gutter-property}-#{$opp}: $gutter-span;
-	}
+        $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': 0));
       }
     }
   }
 
-  @include span-shared;
-
-}
-
-@mixin push-isolation($span, $location, $columns: false, $gutter: false) {
-  @include push-float($span, $location, $columns, $gutter);
-}
-
-@mixin pull-isolation($span, $location, $columns: false, $gutter: false) {
-  @include pull-float($span, $location, $columns, $gutter);
+  @return $Return;
 }
 
 //////////////////////////////
@@ -163,6 +102,15 @@
 //
 // Makes working with Isolation easier, as it moves Clear to a 1st class citizen of the mixin, and automatically builds the verbose grid-span mixin call
 //////////////////////////////
-@mixin isolation-span($span, $location, $clear: false, $grid: false, $gutter: false) {
-  @include grid-span($span, $location, $grid, $gutter, 'isolation', $clear);
-}
+@mixin isolation-span($Span, $Location, $clear: false, $grid: false, $gutter: false, $gutter-style: false, $from: false) {
+  $Options: ();
+  @if $clear {
+    $Options: map-merge($Options, ('clear': $clear));
+  }
+  @if $from {
+    $Options: map-merge($Options, ('from': $from));
+  }
+
+  $Options: if(length($Options) > 0, $Options, null);
+  @include grid-span($Span, $Location, $grid, $gutter, 'isolation', $gutter-style, $Options);
+}

data/stylesheets/singularitygs/grids/_add.scss

@@ -8,28 +8,46 @@
 //                                    https://github.com/Team-Sass/Singularity/wiki/Creating-Grids
 // - $append-to-list  : [list]        A list to append to.
 //                                    Defaults to $grids if none is specified.
-@function add-grid($grid-definition, $append-to-list: $grids) {
-  $parsed:      parse-add($grid-definition); // Converts the definiton to a temporary format:
-                                             // either `((<grid>))` or `((<grid>) (<breakpoint>))`
-  $grid:        nth($parsed, 1); // E. g. `(<grid>)`.
-  $breakpoint:  nth($parsed, 2); // Either `(<breakpoint>)` or false.
-  $list-length: length($append-to-list);
-  
+@function add-grid($grid-definition, $custom-map: false) {
+  $Parsed:      parse-add($grid-definition); // Parses grid definition to grid/breakpoint
+  $Grid:        nth($Parsed, 1); // E. g. `(<grid>)`.
+  $Breakpoint:  nth($Parsed, 2); // Either `(<breakpoint>)` or false.
+  $Mobile-First: sgs-get('mobile first');
+  $Grid-Map: ();
+
+  // Determine if a custom map or the default maps should be used.
+  @if $custom-map {
+    $Grid-Map: $custom-map;
+  }
+  @else {
+    @if sgs-has('grids') {
+      $Grid-Map: sgs-get('grids');
+    }
+  }
+  $Grid-Key-Length: length(map-keys($Grid-Map));
+
   // Check whether the definition will be the first one in the list
   // and whether it has no breakpoint specified.
-  @if $breakpoint == false and $list-length == 0 {
+  @if $Breakpoint == null {
     // Returns the first item of the list, e. g. `(<grid>)`
-    @return $grid;
+    $Grid-Map: map-merge($Grid-Map, (-1px: $Grid));
   }
   // IF the list is initiated with a list of grid columns need to start off
   // a comma seprated list.
-  @elseif $list-length > 1 and length(nth($append-to-list, 2)) == 1 {
-    // Seed the first value and grid + breakpoint seperated by a comma.
-    @return $append-to-list, ($grid $breakpoint);
-  }
   @else {
-    // Appends to a comma-separated list of definitions in the internal format
-    // and returns it, e. g. `(<grid>), (<grid> <breakpoint>), (<grid> <breakpoint>)`
-    @return append($append-to-list, ($grid $breakpoint), 'comma');
+    @if not (map-has-key($Grid-Map, -1px)) {
+      $Grid-Map: map-merge($Grid-Map, map-get($Singularity-Settings, 'grids'));
+    }
+    $Grid-Map: map-merge($Grid-Map, ($Breakpoint: $Grid));
   }
+
+  $Grid-Map: sort-map($Grid-Map, not $Mobile-First);
+
+  @return $Grid-Map;
 }
+
+
+@mixin add-grid($grid-definition) {
+  $Add-Grid: add-grid($grid-definition);
+  $HOLDER: sgs-set('grids', $Add-Grid);
+}

data/stylesheets/singularitygs/grids/_find.scss

@@ -5,19 +5,17 @@
 // From Singularity
 // Must be using Breakpoint to work properly
 //////////////////////////////
-@function find-grid($user-columns: false) {
+@function find-grid($user-columns: null) {
 
   // We supply a default if the user hasn't set any grids and hasn't passed in a custom column set
   // The default supplied is based on original Susy options
-  @if length($grids) == 0 and $user-columns == false {
-    $user-columns: 12;
-  }
+  $Grids: sgs-get('grids');
 
-  $found: find-object($grids, $user-columns);
+  $Found: find-object($Grids, $user-columns);
 
-  @if length($found) == 1 {
-    $found: nth($found, 1);
+  @if length($Found) == 1 {
+    $Found: nth($Found, 1);
   }
 
-  @return $found;
+  @return $Found;
 }

data/stylesheets/singularitygs/gutter-styles/_add.scss

@@ -1,29 +1,52 @@
-// Accepts a gutter style definition in the human-readable format. Converts it to the internal format,
-// appends it to a list of gutter styles and returns the resulting list.
+// Accepts a gutter-style style definition in the human-readable format. Converts it to the internal format,
+// appends it to a list of gutter-style styles and returns the resulting list.
 //
 // Note that this function only returns a new list, it does not modify the source list.
 //
-// add-gutter-style($gutter-style-definition, $append-to-list)
-// - $gutter-definition : <definition>  See documentation for syntax:
+// add-gutter-style-style($gutter-style-style-definition, $append-to-list)
+// - $gutter-style-definition : <definition>  See documentation for syntax:
 //                                      https://github.com/Team-Sass/Singularity/wiki/Creating-Grids
 // - $append-to-list    : [list]        A list to append to.
-//                                      Defaults to $gutters if none is specified.
-@function add-gutter-style($gutter-style-definition, $append-to-list: $gutter-styles) {
-  $parsed: parse-add($gutter-style-definition); // Converts the definition to a temporary format:
-					  // either `((<gutter-style>))` or `((<gutter-style>) (<breakpoint>))`
-  $gutter-style:      nth($parsed, 1); // E. g. `(<gutter-style>)`.
-  $breakpoint:        nth($parsed, 2); // Either `(<breakpoint>)` or false.
-  $list-length:       length($append-to-list);
+//                                      Defaults to $gutter-styles if none is specified.
+@function add-gutter-style($gutter-style-definition, $custom-map: false) {
+  $Parsed:        parse-add($gutter-style-definition); // Parses gutter-style definition to gutter-style/breakpoint
+  $Gutter-Style:  nth($Parsed, 1); // E. g. `(<gutter-style>)`.
+  $Breakpoint:    nth($Parsed, 2); // Either `(<breakpoint>)` or false.
+  $Mobile-First:  sgs-get('mobile first');
+  $Gutter-Style-Map: ();
+
+  // Determine if a custom map or the default maps should be used.
+  @if $custom-map {
+    $Gutter-Style-Map: $custom-map;
+  }
+  @else {
+    @if sgs-has('gutter styles') {
+      $Gutter-Style-Map: sgs-get('gutter styles');
+    }
+  }
+  $Gutter-Style-Key-Length: length(map-keys($Gutter-Style-Map));
 
   // Check whether the definition will be the first one in the list
   // and whether it has no breakpoint specified.
-  @if $breakpoint == false and $list-length == 0 {
+  @if $Breakpoint == null {
     // Returns the first item of the list, e. g. `(<gutter-style>)`
-    @return $gutter-style;
+    $Gutter-Style-Map: map-merge($Gutter-Style-Map, (-1px: $Gutter-Style));
   }
+  // IF the list is initiated with a list of gutter-style columns need to start off
+  // a comma seprated list.
   @else {
-    // Appends to a comma-separated list of definitions in the internal format
-    // and returns it, e. g. `(<gutter>), (<gutter> <breakpoint>), (<gutter> <breakpoint>)`
-    @return append($append-to-list, ($gutter-style $breakpoint), 'comma');
+    @if not (map-has-key($Gutter-Style-Map, -1px)) {
+      $Gutter-Style-Map: map-merge($Gutter-Style-Map, map-get($Singularity-Settings, 'gutter styles'));
+    }
+    $Gutter-Style-Map: map-merge($Gutter-Style-Map, ($Breakpoint: $Gutter-Style));
   }
+
+  $Gutter-Style-Map: sort-map($Gutter-Style-Map, not $Mobile-First);
+
+  @return $Gutter-Style-Map;
 }
+
+@mixin add-gutter-style($gutter-style-definition) {
+  $Add-gutter-style: add-gutter-style($gutter-style-definition);
+  $HOLDER: sgs-set('gutter styles', $Add-gutter-style);
+}

data/stylesheets/singularitygs/gutter-styles/_find.scss

@@ -5,12 +5,17 @@
 // From Singularity
 // Must be using Breakpoint to work properly
 //////////////////////////////
-@function find-gutter-style($user-gutter-style: false) {
+@function find-gutter-style($user-gutter-styles: null) {
 
-  // We supply a default if the user hasn't set any gutter style and hasn't passed in a custom gutter
-  @if length($gutter-styles) == 0 and $user-gutter-style == false {
-    $user-gutter-style: opposite;
+  // We supply a default if the user hasn't set any gutters and hasn't passed in a custom column set
+  // The default supplied is based on original Susy options
+  $Gutters-Styles: sgs-get('gutter styles');
+
+  $Found: find-object($Gutters-Styles, $user-gutter-styles);
+
+  @if length($Found) == 1 {
+    $Found: nth($Found, 1);
   }
 
-  @return find-object($gutter-styles, $user-gutter-style);
+  @return $Found;
 }

data/stylesheets/singularitygs/gutter-styles/_helpers.scss

@@ -1,18 +1,14 @@
-@function fixed-gutter($user-columns: false, $user-gutter: false, $user-gutter-style: false) {
-  $grid: find-grid($user-columns);
-  $gutter: find-gutter($user-gutter);
-  $gutter-style: find-gutter-style($user-gutter-style);
-
-  @if index($gutter-style, fixed) {
+@function fixed-gutter($user-columns, $user-gutter, $user-gutter-style) {
+  @if index($user-gutter-style, 'fixed') {
     // @debug 'Fixed in output style';
     @return true;
   }
-  @else if type-of($grid) == 'number' and not unitless($gutter) {
+  @else if type-of($user-columns) == 'number' and not unitless($user-gutter) {
     // @debug 'Equal columns with a unit based gutter';
     @return true;
   }
-  @else if type-of($grid) == 'list' {
-    @if unit(nth($grid, 1)) != unit($gutter) {
+  @else if type-of($user-columns) == 'list' {
+    @if unit(nth($user-columns, 1)) != unit($user-gutter) {
       // @debug 'Columns and gutters are different units';
       @return true;
     }
@@ -24,7 +20,7 @@
   @return false;
 }
 
-@function gutter-property($user-columns: false, $user-gutter: false, $user-gutter-style: false) {
+@function gutter-property($user-columns, $user-gutter, $user-gutter-style) {
   @if fixed-gutter($user-columns, $user-gutter, $user-gutter-style) {
     @return 'padding';
   }

data/stylesheets/singularitygs/gutters/_add.scss

@@ -3,27 +3,50 @@
 //
 // Note that this function only returns a new list, it does not modify the source list.
 //
-// add-gutter($grid-definition, $append-to-list)
+// add-gutter($Gutter-definition, $append-to-list)
 // - $gutter-definition : <definition>  See documentation for syntax:
-//                                      https://github.com/Team-Sass/Singularity/wiki/Creating-Grids
+//                                      https://github.com/Team-Sass/Singularity/wiki/Creating-Gutters
 // - $append-to-list    : [list]        A list to append to.
 //                                      Defaults to $gutters if none is specified.
-@function add-gutter($gutter-definition, $append-to-list: $gutters) {
-  $parsed: parse-add($gutter-definition); // Converts the definiton to a temporary format:
-                                          // either `((<gutter>))` or `((<gutter>) (<breakpoint>))`
-  $gutter:      nth($parsed, 1); // E. g. `(<gutter>)`.
-  $breakpoint:  nth($parsed, 2); // Either `(<breakpoint>)` or false.
-  $list-length: length($append-to-list);
+@function add-gutter($gutter-definition, $custom-map: false) {
+  $Parsed:      parse-add($gutter-definition); // Parses Gutter definition to Gutter/breakpoint
+  $Gutter:        nth($Parsed, 1); // E. g. `(<Gutter>)`.
+  $Breakpoint:  nth($Parsed, 2); // Either `(<breakpoint>)` or false.
+  $Mobile-First: sgs-get('mobile first');
+  $Gutter-Map: ();
+
+  // Determine if a custom map or the default maps should be used.
+  @if $custom-map {
+    $Gutter-Map: $custom-map;
+  }
+  @else {
+    @if sgs-has('gutters') {
+      $Gutter-Map: sgs-get('gutters');
+    }
+  }
+  $Gutter-Key-Length: length(map-keys($Gutter-Map));
 
   // Check whether the definition will be the first one in the list
   // and whether it has no breakpoint specified.
-  @if $breakpoint == false and $list-length == 0 {
-    // Returns the first item of the list, e. g. `(<gutter>)`
-    @return $gutter;
+  @if $Breakpoint == null {
+    // Returns the first item of the list, e. g. `(<Gutter>)`
+    $Gutter-Map: map-merge($Gutter-Map, (-1px: $Gutter));
   }
+  // IF the list is initiated with a list of Gutter columns need to start off
+  // a comma seprated list.
   @else {
-    // Appends to a comma-separated list of definitions in the internal format
-    // and returns it, e. g. `(<gutter>), (<gutter> <breakpoint>), (<gutter> <breakpoint>)`
-    @return append($append-to-list, ($gutter $breakpoint), 'comma');
+    @if not (map-has-key($Gutter-Map, -1px)) {
+      $Gutter-Map: map-merge($Gutter-Map, map-get($Singularity-Settings, 'gutters'));
+    }
+    $Gutter-Map: map-merge($Gutter-Map, ($Breakpoint: $Gutter));
   }
+
+  $Gutter-Map: sort-map($Gutter-Map, not $Mobile-First);
+
+  @return $Gutter-Map;
 }
+
+@mixin add-gutter($gutter-definition) {
+  $Add-Gutter: add-gutter($gutter-definition);
+  $HOLDER: sgs-set('gutters', $Add-Gutter);
+}

data/stylesheets/singularitygs/gutters/_find.scss

@@ -5,13 +5,17 @@
 // From Singularity
 // Must be using Breakpoint to work properly
 //////////////////////////////
-@function find-gutter($user-gutter: false) {
+@function find-gutter($user-gutters: null) {
 
-  // We supply a default if the user hasn't set any gutters and hasn't passed in a custom gutter
+  // We supply a default if the user hasn't set any gutters and hasn't passed in a custom column set
   // The default supplied is based on original Susy options
-  @if length($gutters) == 0 and $user-gutter == false {
-    $user-gutter: .25;
+  $Gutters: sgs-get('gutters');
+
+  $Found: find-object($Gutters, $user-gutters);
+
+  @if length($Found) == 1 {
+    $Found: nth($Found, 1);
   }
 
-  @return nth(find-object($gutters, $user-gutter), 1);
+  @return $Found;
 }