susy 2.0.0.alpha.5 → 2.0.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e517f778e7f713696b11510f0a423df0e9a063f9
-  data.tar.gz: e914949051598b83a963cd9ffea85270b3afab05
+  metadata.gz: 9d9745f52ad903a2a78251d04371ec781709c112
+  data.tar.gz: 813b91ca3c0342062062b4ec627ac5a4c41ed8cb
 SHA512:
-  metadata.gz: 144fcea1e2eb1b17bc1903c741f7b7824e412f6f99218a0da4614f7c5913d50da46abb821bf48624faf4baed70bddcc1e076ee8c77a84971739dcb9c13b3d506
-  data.tar.gz: e4e421fc81b114835a68e5003fc69c72529cac96140fdfa9fad74a71443e12340d802796449cdb68ec1ba30261108bf35049a44452ea5f38cdb0825c66e353ef
+  metadata.gz: c566795d29e1ee51da335d566ac39d339c47557970e69d749dc34243808fb4bf2d4dbd525e6fd4f31c6dc18cfbda7dc1070b7f36087c9ace2fa91cc6e8291841
+  data.tar.gz: 3cd5e4b3c2474377dbc1595b0097b564b5a5df032fcdc4dff3228fe0e823e4ceb6a3cf16196212992db3d022e3b3a7bd9aa020bbe0fc4ec1eedfcfed436b1000

data/VERSION

@@ -1 +1 @@
-2.0.0.alpha.4
+2.0.0.alpha.5

data/sass/susy/language/_susy.scss

@@ -4,9 +4,8 @@
 @import "../core";
 @import "../api/float";
 
-@import "shared";
-
 @import "susy/settings";
+@import "susy/grids";
 @import "susy/context";
 @import "susy/background";
 @import "susy/container";

data/sass/susy/language/susy/_bleed.scss

@@ -8,9 +8,8 @@
 @mixin bleed(
   $bleed: 0 gutter()
 ) {
-  $bleed    : parse-bleed($bleed);
-  $context  : get-span-context($bleed);
-  $trbl     : span-get(span, $bleed);
+  $bleed    : parse-span($bleed);
+  $trbl     : susy-get(span, $bleed);
   $spans    : (top: 0, right: 0, bottom: 0, left: 0);
 
   $i: 1;
@@ -31,7 +30,7 @@
   @each $side, $span in $spans {
     $padding: $span;
     @if is-inside($bleed) and ($side == right or $side == left) {
-      $gutter: gutter($context);
+      $gutter: gutter($bleed);
       $padding: if(comparable($padding, $gutter), $padding + $gutter, $padding);
     }
     margin-#{$side}: if($span != 0, 0 - $span, null);
@@ -44,8 +43,8 @@
 @mixin bleed-x(
   $bleed: gutter()
 ) {
-  $bleed  : parse-bleed($bleed);
-  $trbl   : span-get(span, $bleed);
+  $bleed  : parse-span($bleed);
+  $trbl   : susy-get(span, $bleed);
 
   @if length($trbl) == 1 {
     $bleed: map-merge($bleed, (span: 0 nth($trbl, 1)));
@@ -61,8 +60,8 @@
 @mixin bleed-y(
   $bleed: if(function-exists(rhythm), rhythm(1), 1em)
 ) {
-  $bleed  : parse-bleed($bleed);
-  $trbl   : span-get(span, $bleed);
+  $bleed  : parse-span($bleed);
+  $trbl   : susy-get(span, $bleed);
 
   @if length($trbl) == 1 {
     $bleed: map-merge($bleed, (span: nth($trbl, 1) 0));
@@ -74,36 +73,3 @@
 
   @include bleed($bleed);
 }
-
-// Parse Bleed
-// -----------
-// Parse the bleed syntax, returning a TRBL list of spans
-// - $bleed: <bleed>
-@function parse-bleed(
-  $bleed
-) {
-  $return: $bleed;
-
-  @if type-of($bleed) != map {
-    $return: parse-span($bleed);
-    $span-list: ();
-    $keywords: false;
-    $i: 1;
-
-    @while not $keywords and $i <= length($bleed) {
-      $item: nth($bleed, $i);
-
-      @if type-of($item) == number {
-        $span-list: append($span-list, $item);
-      } @else {
-        $keywords: true;
-      }
-
-      $i: $i + 1;
-    }
-
-    $return: map-merge($return, (span: $span-list));
-  }
-
-  @return map-merge($return, (spread: wide));
-}

data/sass/susy/language/susy/_context.scss

@@ -9,9 +9,9 @@
   $context
 ) {
   $context    : parse-span($context);
-  $span       : span-get(span, $context);
-  $location   : span-get(location, $context);
-  $columns    : span-get(columns, $context);
+  $span       : susy-get(span, $context);
+  $location   : susy-get(location, $context);
+  $columns    : susy-get(columns, $context);
 
   @return get-columns($span, $location, $columns);
 }

data/sass/susy/language/susy/_gallery.scss

@@ -13,12 +13,12 @@
   $layout             : parse-span($layout);
   $layout             : map-merge($layout, (location: 1));
 
-  $span               : span-get(span, $layout);
-  $columns            : span-get(columns, $layout);
+  $span               : susy-get(span, $layout);
+  $columns            : susy-get(columns, $layout);
   $context            : column-count($columns);
-  $flow               : span-get(flow, $layout);
+  $flow               : susy-get(flow, $layout);
 
-  $box                : span-get(box-sizing, $layout);
+  $box                : susy-get(box-sizing, $layout);
   $inside             : is-inside($layout);
   $from               : from($flow);
   $line               : floor($context / $span);
@@ -73,7 +73,7 @@
       // Individual Output
       @include float-span-output($output...);
 
-      @if is-first(span-get(location, $layout)) {
+      @if is-first(susy-get(location, $layout)) {
         @include first($layout);
         clear: $from;
       } @else {
@@ -81,7 +81,7 @@
       }
 
       // Individual Location Increment
-      $location: span-get(location, $layout) + $span;
+      $location: susy-get(location, $layout) + $span;
       $location: if($location > $context, 1, $location);
       $layout: map-merge($layout, (location: $location));
     }

data/sass/susy/language/susy/_grids.scss

@@ -0,0 +1,34 @@
+// Grid Syntax
+// ===========
+
+// Set Grid
+// --------
+// Set a new grid using a shorthand
+// - $grid      : <settings>
+@mixin set-grid(
+  $grid
+) {
+  $susy: map-merge($susy, parse-grid($grid)) !global;
+}
+
+// Alternative syntax
+@mixin susy-set(
+  $grid
+) {
+  @include set-grid($grid);
+}
+
+// Use Grid
+// --------
+// Use an arbitrary grid for a section of code
+// - $grid      : <settings>
+@mixin use-grid(
+  $grid
+) {
+  $old: $susy;
+
+  @include set-grid($grid);
+  @content;
+
+  $susy: $old !global;
+}

data/sass/susy/language/susy/_gutters.scss

@@ -13,7 +13,7 @@
   $output     : (
     before: map-get($gutters, before),
     after: map-get($gutters, after),
-    flow: span-get(flow, $context),
+    flow: susy-get(flow, $context),
   );
 
   @if is-inside($context) {
@@ -50,23 +50,6 @@
   @return gutter($context);
 }
 
-// Parse Gutters
-// -------------
-// Return context with override value set
-// $context: <context>
-@function parse-gutters(
-  $context: $susy
-) {
-  $context      : parse-span($context);
-  $override     : span-get(gutter-override, $context) or span-get(span, $context);
-
-  @if $override and not unitless($override) {
-    $context: map-merge($context, (gutter-override: $override));
-  }
-
-  @return $context;
-}
-
 // Get Gutter Width
 // ----------------
 // Return gutter width.
@@ -75,20 +58,22 @@
   $context: $susy
 ) {
   $context  : parse-gutters($context);
-  $gutter   : span-get(gutter-override, $context);
+  $gutter   : susy-get(gutter-override, $context);
 
   @if not $gutter {
-    $gutters: span-get(gutters, $context);
-    $column-width: span-get(column-width, $context);
+    $gutters: susy-get(gutters, $context);
+    $column-width: susy-get(column-width, $context);
     @if $column-width and gutter-math($context) == static {
       $gutter: $gutters * $column-width;
     } @else {
-      $columns  : span-get(columns, $context);
-      $spread    : if(is-split($context), wide, span-get(spread, $context));
+      $columns  : susy-get(columns, $context);
+      $spread   : if(is-split($context), wide, susy-get(spread, $context));
       $gutter   : percentage($gutters / column-sum($columns, $gutters, $spread));
     }
   }
 
+  $gutter: if($gutter == 'no-gutters' or $gutter == 'no-gutter', null, $gutter);
+
   @return $gutter;
 }
 
@@ -100,11 +85,11 @@
   $context: $susy
 ) {
   $context          : parse-gutters($context);
-  $gutter-position  : span-get(gutter-position, $context);
+  $gutter-position  : susy-get(gutter-position, $context);
   $gutter           : get-gutter-width($context);
   $return           : (before: null, after: null);
 
-  @if is-split($context) {
+  @if is-split($context) and $gutter {
     $gutter: $gutter / 2;
     $return: map-merge($return, (before: $gutter, after: $gutter));
   } @else {

data/sass/susy/language/susy/_isolate.scss

@@ -11,7 +11,7 @@
   $input  : parse-span($input);
   $output : (
     push: get-isolation($input),
-    flow: span-get(flow, $input),
+    flow: susy-get(flow, $input),
   );
 
   @include isolate-output($output...);
@@ -24,9 +24,9 @@
 @function get-isolation(
   $input
 ) {
-  $span       : span-get(span, $input);
-  $location   : span-get(location, $input);
-  $columns    : span-get(columns, $input);
+  $span       : susy-get(span, $input);
+  $location   : susy-get(location, $input);
+  $columns    : susy-get(columns, $input);
   $width      : null;
 
   @if type-of($location) == number and not unitless($location) {
@@ -43,7 +43,7 @@
     }
   }
 
-  @if span-get(gutter-position, $input) == split {
+  @if susy-get(gutter-position, $input) == split {
     $width: if($width == null, gutters($input), $width + gutters($input));
   }
 

data/sass/susy/language/susy/_margins.scss

@@ -9,8 +9,8 @@
   $span
 ) {
   $span   : map-merge((spread: wide), parse-span($span));
-  $flow   : span-get(flow, $span);
-  $split  : if(span-get(gutter-position, $span) == split, true, false);
+  $flow   : susy-get(flow, $span);
+  $split  : if(susy-get(gutter-position, $span) == split, true, false);
   $width  : if($split, span($span) + gutter($span), span($span));
 
   @include margin-output($width, null, $flow);
@@ -24,8 +24,8 @@
   $span
 ) {
   $span   : map-merge((spread: wide), parse-span($span));
-  $flow   : span-get(flow, $span);
-  $split  : if(span-get(gutter-position, $span) == split, true, false);
+  $flow   : susy-get(flow, $span);
+  $split  : if(susy-get(gutter-position, $span) == split, true, false);
   $width  : if($split, span($span) + gutter($span), span($span));
 
   @include margin-output(null, $width, $flow);
@@ -49,8 +49,8 @@
   $span
 ) {
   $span   : map-merge((spread: wide), parse-span($span));
-  $flow   : span-get(flow, $span);
-  $split  : if(span-get(gutter-position, $span) == split, true, false);
+  $flow   : susy-get(flow, $span);
+  $split  : if(susy-get(gutter-position, $span) == split, true, false);
   $width  : if($split, 0 - span($span) + gutter($span), 0 - span($span));
 
   @include margin-output($width, null, $flow);

data/sass/susy/language/susy/_padding.scss

@@ -9,9 +9,14 @@
   $span
 ) {
   $span   : map-merge((spread: wide), parse-span($span));
-  $flow   : span-get(flow, $span);
+  $flow   : susy-get(flow, $span);
   $width  : span($span);
 
+  @if is-inside($span) {
+    $gutter: gutter($span);
+    $width: if($gutter and comparable($width, $gutter), $width + $gutter, $width);
+  }
+
   @include padding-output($width, null, $flow);
 }
 
@@ -23,9 +28,14 @@
   $span
 ) {
   $span   : map-merge((spread: wide), parse-span($span));
-  $flow   : span-get(flow, $span);
+  $flow   : susy-get(flow, $span);
   $width  : span($span);
 
+  @if is-inside($span) {
+    $gutter: gutter($span);
+    $width: if($gutter and comparable($width, $gutter), $width + $gutter, $width);
+  }
+
   @include padding-output(null, $width, $flow);
 }
 
@@ -42,11 +52,6 @@
   $pre      : map-merge((spread: wide), parse-span($pre));
   $post     : map-merge((spread: wide), parse-span($post));
 
-  $output   : (
-    before: span($pre),
-    after: span($post),
-    flow: span-get(flow, $pre) or span-get(flow, $post),
-  );
-
-  @include padding-output($output...);
+  @include prefix($pre);
+  @include suffix($post);
 }

data/sass/susy/language/susy/_rows.scss

@@ -33,8 +33,8 @@
 ) {
   $span: parse-span($span);
 
-  @include row(span-get(flow, $span));
-  @if is-split($span) and not span-get(is-container, $span) {
+  @include row(susy-get(flow, $span));
+  @if is-split($span) and not susy-get(is-container, $span) {
     @include gutters($span);
   }
   float: none;

data/sass/susy/language/susy/_settings.scss

@@ -26,10 +26,11 @@ $susy-keywords: (
   container-position: left center right,
   flow: ltr rtl,
   show-grids: show hide show-columns show-baseline,
-  gutter-position: before after split inside inside-static no-gutters,
+  gutter-position: before after split inside inside-static,
   box-sizing: border-box content-box,
   location: first alpha last omega,
   spread: narrow wide wider,
+  gutter-override: no-gutters no-gutter,
   is-container: container,
 );
 
@@ -39,3 +40,161 @@ $susy-keywords: (
 // - Set EITHER $column-width OR $container
 // - Use $column-width for static layouts
 $susy: () !default;
+
+// Parse Susy Keywords and Maps
+// ----------------------------
+@function parse-settings(
+  $short: $susy
+) {
+  $return: ();
+
+  @if type-of($short) == map {
+    $return: $short;
+  } @else {
+    @each $item in $short {
+      // strings
+      @if type-of($item) == string {
+        @each $key, $value in $susy-keywords {
+          @if index($value, $item) {
+            $return: map-merge($return, ($key: $item));
+          }
+        }
+      // maps
+      } @else if type-of($item) == map {
+        $return: map-merge($return, $item);
+      }
+    }
+  }
+
+  @return $return;
+}
+
+// Parse Columns & Gutters
+// -----------------------
+@function parse-layout(
+  $short
+) {
+  $return: ();
+  $columns: ();
+  $gutters: null;
+
+  @if not unitless(nth(nth($short, 1), 1)) {
+    $gutters: nth($short, 1);
+  } @else {
+    $columns: (columns: nth($short, 1));
+    $gutters: if(length($short) > 1, nth($short, 2), $gutters);
+  }
+
+  @if type-of($gutters) == list and length($gutters) > 0 {
+    $gutters: (
+      gutters: nth($gutters, 2) / nth($gutters, 1),
+      column-width: nth($gutters, 1),
+    );
+  } @else {
+    $gutters: if($gutters, (gutters: $gutters), ());
+  }
+
+  $return: map-merge($return, $columns);
+  $return: map-merge($return, $gutters);
+
+  @return $return;
+}
+
+// Parse Grid/Context
+// ------------------
+@function parse-grid(
+  $short: $susy
+) {
+  $return: parse-settings($short);
+  $layout: ();
+
+  @if type-of($short) == map {
+    $return: $short;
+  } @else {
+    @each $item in $short {
+      // number or list
+      @if type-of($item) == number or type-of($item) == list {
+        @if type-of($item) == list or unitless($item) {
+          $layout: append($layout, $item);
+        } @else {
+          $return: map-merge($return, (container: $item));
+        }
+      }
+    }
+
+    $layout: if(length($layout) > 0, parse-layout($layout), $layout);
+  }
+
+  @return map-merge($return, $layout);
+}
+
+// Parse Span
+// ----------
+@function parse-span(
+  $short,
+  $key: span
+) {
+  $return: ();
+
+  @if type-of($short) == map {
+    $return: $short;
+  } @else {
+    $at: index($short, at);
+
+    @if $at {
+      $loci: $at + 1;
+      $location: nth($short, $loci);
+      $return: map-merge($return, (location: $location));
+      $short: set-nth($short, $at, null);
+      $short: set-nth($short, $loci, null);
+    }
+
+    $i: 1;
+    $span: ();
+
+    @while $i <= length($short) {
+      $this: nth($short, $i);
+
+      @if type-of($this) == number {
+        $span: append($span, $this);
+        $short: set-nth($short, $i, null);
+      } @else if $this == of {
+        $short: set-nth($short, $i, null);
+        $i: length($short) + 1;
+      }
+
+      $i: $i + 1;
+    }
+
+    @if length($span) > 0 {
+      $span: if(length($span) == 1, nth($span, 1), $span);
+      $return: map-merge($return, ($key: $span));
+    }
+
+    $return: map-merge($return, parse-grid($short));
+  }
+
+  @return $return;
+}
+
+// Parse Gutters
+// -------------
+@function parse-gutters(
+  $short: $susy
+) {
+  @return parse-span($short, gutter-override);
+}
+
+// Susy Get
+// --------
+// Return one setting from a grid
+// - $key   : <keyword>
+// - $grid  : <settings>
+@function susy-get(
+  $key,
+  $grid: map-merge($susy-defaults, $susy)
+) {
+  $grid: parse-grid($grid);
+
+  @return map-get($grid, $key) or map-get($susy, $key) or map-get($susy-defaults, $key);
+}

data/sass/susy/language/susy/_span.scss

@@ -10,7 +10,7 @@
 ) {
   $span     : parse-span($span);
   $output   : span-math($span);
-  $box      : span-get(box-sizing, $span) or if(is-inside($span), border-box, null);
+  $box      : susy-get(box-sizing, $span) or if(is-inside($span), border-box, null);
 
   @include susy-box-sizing($box);
   @include float-span-output($output...);
@@ -24,101 +24,7 @@
 @function span(
   $span
 ) {
-  @return get-span-width(parse-span($span));
-}
-
-// Parse Span
-// ----------
-// Parse the span shortcut syntax.
-// - $string  : <span>
-@function parse-span(
-  $string
-) {
-  @if type-of($string) == map {
-    @return $string;
-  } @else {
-    $return: map-merge($susy-defaults, $susy);
-    $i: 1;
-
-    @while $i <= length($string) {
-      $item  : nth($string,$i);
-      $at     : false;
-      $of     : false;
-      $gutter : false;
-
-      // maps
-      @if type-of($item) == map {
-        $return: map-merge($return, $item);
-
-      // keywords
-      } @else if type-of($item) == string {
-
-        // at, of, gutter
-        @if index(at of gutter gutters, $item) {
-          $at: index(at, $item);
-          $of: index(of, $item);
-          $gutter: index(gutter gutters, $item);
-        } @else {
-          @each $key, $value in $susy-keywords {
-            @if index($value, $item) {
-              $return: map-merge($return, ($key: $item));
-            }
-          }
-        }
-
-      // span
-      } @else if not map-get($return, span) and type-of($item) == number {
-        $return: map-merge($return, (span: $item));
-      }
-
-      // location integer
-      @if $at {
-        $i: $i + 1;
-        $return: map-merge($return, (location: nth($string, $i)));
-      }
-
-      // gutter override
-      @if $gutter {
-        $i: $i + 1;
-        $return: map-merge($return, (gutter-override: nth($string, $i)));
-      }
-
-      // context
-      @if $of {
-        $i: $i + 1;
-        $context: ();
-
-        @while $of and $i <= length($string) {
-          $this: nth($string,$i);
-          @if type-of($this) != string {
-            $context: append($context, $this);
-            $i: $i + 1;
-          } @else {
-            $of: false;
-            $i: $i - 1;
-          }
-        }
-
-        $return: map-merge($return, parse-grid($context));
-      }
-
-      $i: $i + 1;
-    }
-
-    @return $return;
-  }
-}
-
-// Get Span Setting
-// ----------------
-// Return one particular span setting from a list.
-// - $setting   : <keyword> (see $options below)
-// - $span      : <span>
-@function span-get(
-  $key,
-  $span
-) {
-  @return map-get(parse-span($span), $key) or map-get($susy-defaults, $key);
+  @return get-span-width($span);
 }
 
 // Span Math
@@ -128,7 +34,7 @@
 @function span-math(
   $span
 ) {
-  $split-container  : if(is-split($span) and span-get(is-container, $span), true, false);
+  $split-container  : if(is-split($span) and susy-get(is-container, $span), true, false);
 
   $float            : from;
   $padding-before   : null;
@@ -144,7 +50,7 @@
 
   // apply gutters
   @if is-inside($span) {
-    @if not span-get(is-container, $span) {
+    @if not susy-get(is-container, $span) {
       $padding-before: map-get($gutters, before);
       $padding-after: map-get($gutters, after);
     }
@@ -156,16 +62,16 @@
   }
 
   // special margin handling
-  @if span-get(layout-method, $span) == isolate {
+  @if susy-get(layout-method, $span) == isolate {
     $margin-before: get-isolation($span);
     $margin-after: -100%;
   } @else {
-    $location: span-get(location, $span);
+    $location: susy-get(location, $span);
     @if $location {
-      $last: is-last(span-get(span, $span), $location, span-get(columns, $span));
+      $last: is-last(susy-get(span, $span), $location, susy-get(columns, $span));
       $is-split: is-split($span);
       @if $last {
-        $float: span-get(last-flow, $span);
+        $float: susy-get(last-flow, $span);
         $margin-after: if($is-split, $margin-after, null);
       } @else if is-first($location) {
         $margin-before: if($is-split, $margin-before, null);
@@ -180,7 +86,7 @@
     margin_after    : $margin-after,
     padding_before  : $padding-before,
     padding_after   : $padding-after,
-    flow            : span-get(flow, $span),
+    flow            : susy-get(flow, $span),
   );
 }
 
@@ -191,11 +97,13 @@
 @function get-span-width(
   $span
 ) {
-  $n        : span-get(span, $span);
-  $location : span-get(location, $span);
-  $columns  : span-get(columns, $span);
-  $gutters  : span-get(gutters, $span);
-  $spread   : span-get(spread, $span);
+  $span     : parse-span($span);
+
+  $n        : susy-get(span, $span);
+  $location : susy-get(location, $span);
+  $columns  : susy-get(columns, $span);
+  $gutters  : susy-get(gutters, $span);
+  $spread   : susy-get(spread, $span);
 
   $context  : null;
   $span-sum : null;
@@ -205,8 +113,8 @@
     $context: column-sum($columns, $gutters, if(is-split($span), wide, narrow));
     $span-sum: get-column-span-sum($n, $location, $columns, $gutters, if(is-inside($span), wide, $spread));
 
-    @if span-get(layout-math, $span) == static {
-      $width: $span-sum * span-get(column-width, $span);
+    @if susy-get(layout-math, $span) == static {
+      $width: $span-sum * susy-get(column-width, $span);
     } @else {
       $width: percentage($span-sum / $context);
     }
@@ -216,21 +124,3 @@
 
   @return $width;
 }
-
-// Get Span Context
-// ----------------
-// - $span: <map>
-@function get-span-context(
-  $span
-) {
-  $span: parse-span($span);
-  $return: ();
-
-  @each $key, $value in $span {
-    @if not index(span location, $key) {
-      $return: map-merge($return, ($key: $value));
-    }
-  }
-
-  @return $return;
-}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.5
+  version: 2.0.0.alpha.6
 platform: ruby
 authors:
 - Eric Meyer
@@ -71,14 +71,13 @@ files:
 - sass/susy/helpers/_clearfix.scss
 - sass/susy/helpers/_direction.scss
 - sass/susy/helpers/_nth.scss
-- sass/susy/language/_shared.scss
 - sass/susy/language/_susy.scss
-- sass/susy/language/shared/_settings.scss
 - sass/susy/language/susy/_background.scss
 - sass/susy/language/susy/_bleed.scss
 - sass/susy/language/susy/_container.scss
 - sass/susy/language/susy/_context.scss
 - sass/susy/language/susy/_gallery.scss
+- sass/susy/language/susy/_grids.scss
 - sass/susy/language/susy/_gutters.scss
 - sass/susy/language/susy/_isolate.scss
 - sass/susy/language/susy/_margins.scss

data/sass/susy/language/_shared.scss

@@ -1,4 +0,0 @@
-// Shared Syntax
-// =============
-
-@import "shared/settings";

data/sass/susy/language/shared/_settings.scss

@@ -1,104 +0,0 @@
-// Grid Syntax
-// ===========
-
-// Set Grid
-// --------
-// Set a new grid using a shorthand
-// - $grid      : <settings>
-@mixin set-grid(
-  $grid
-) {
-  $susy: map-merge($susy, parse-grid($grid)) !global;
-}
-
-// Alternative syntax
-@mixin susy-set(
-  $grid
-) {
-  @include set-grid($grid);
-}
-
-// Use Grid
-// --------
-// Use an arbitrary grid for a section of code
-// - $grid      : <settings>
-@mixin use-grid(
-  $grid
-) {
-  $old: $susy;
-
-  @include set-grid($grid);
-  @content;
-
-  $susy: $old !global;
-}
-
-// Parse Grid
-// ----------
-// Parse a shorthand grid, and return an ordered list of settings
-// - [$grid]  : <settings>
-@function parse-grid(
-  $grid
-) {
-  $return: $grid;
-
-  @if type-of($grid) != map {
-    $return         : ();
-    $columns-check  : false;
-
-    @each $item in $grid {
-
-      // maps
-      @if type-of($item) == map {
-        $return: map-merge($return, $item);
-
-      // Keywords
-      } @else if type-of($item) == string {
-        @each $key, $value in $susy-keywords {
-          @if index($value, $item) {
-            $return: map-merge($return, ($key: $item));
-          }
-        }
-      }
-
-      // Container, Columns, or Gutters
-      @else if type-of($item) == number {
-        @if not unitless($item) {
-          $return: map-merge($return, (container: $item));
-        } @else if not $columns-check {
-          $return: map-merge($return, (columns: $item));
-          $columns-check: true;
-        } @else {
-          $return: map-merge($return, (gutters: $item));
-        }
-      }
-
-      // Columns or Gutters
-      @else if type-of($item) == list {
-        @if unitless(nth($item,1)) {
-          $return: map-merge($return, (columns: $item));
-          $columns-check: true;
-        } @else {
-          $return: map-merge($return, (column-width: nth($item,1)));
-          $return: map-merge($return, (gutters: nth($item,2) / nth($item,1)));
-        }
-      }
-    }
-  }
-
-  @return $return;
-}
-
-// Get Setting
-// -----------
-// Return one setting from a grid
-// - setting    : <keyword>
-// - $grid      : <settings>
-@function susy-get(
-  $key,
-  $grid: map-merge($susy-defaults, $susy)
-) {
-  $grid: parse-grid($grid);
-
-  @return map-get($grid, $key) or map-get($susy, $key) or map-get($susy-defaults, $key);
-}