singularitygs 1.1.2 → 1.8.0

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;
 }