susy 2.1.3 → 2.2.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41a4f138eb6b42677e40c4c2a17e172bc3ea92b4
-  data.tar.gz: 0e5483a91ece1fd3140eac196f4a1ca6201bdfb0
+  metadata.gz: d3d0591f512412a10d2cc0d8a9bb0daf2b2161fa
+  data.tar.gz: adfd26326c13e5af97efbf4386078be3739717d5
 SHA512:
-  metadata.gz: d9484ab363b6bf01f9f2e0b33fb380c22124e3df42dfdda246dab9e5c74783a100bac37b2c9e4a34bc872c501c7454b578b2b0c85066bb37ec5a2a4b2de8b0d5
-  data.tar.gz: 129fdfddc59f4ee90a61f6b4d04e16e9767eb2e4b4530dd24dd340eca40ee3dd6e3add08c0c2f91142b33daf9bcca9aaa13b44458304a224c54a37aed1b10862
+  metadata.gz: 2fb29b9a8c512387fc3a8192d566c9f56a28255a0efe52cb644045766f9c1accfebcccecb821510088ea5d62b133496c2531d40e076a981ade61af257000d43e
+  data.tar.gz: 5518f798611cb3a6d9dbdde2b307cd61fdaacdb35a944c1e5766b4b7760765557d44bf6c36aae7cdb0f2371820760700719359f126ee93e9b481b0c2f440cf94

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.2.0.beta.1

data/docs/changelog.rst

@@ -1,6 +1,30 @@
 Changelog
 =========
 
+2.2.0 - UNRELEASED
+------------------
+
+- Update ``global-box-sizing`` and the legacy ``border-box-sizing``
+  mixins to optionally take another argument, ``$inherit``. This new
+  argument is a boolean value that defaults to ``false``, meaning the
+  behavior of these mixins will not change by default. The default
+  behavior sets all elements to use the specified ``box-sizing``,
+  which can only be changed explicitly on a per-element basis. By passing
+  in ``$inherit`` as ``true``, the ``box-sizing`` is set on the
+  ``html`` element, and all other elements inherit this property. This
+  means that the ``box-sizing`` can be changed at the component level
+  and all nested elements will inherit this change. This cascading
+  effect can be prevented by explicitly setting ``box-sizing`` on the
+  exceptions within the nested context.
+- Add ``su`` import at root level.
+- Both ``su`` and ``susy`` work with the latest LibSass master branch (3.0.2+).
+  There are a few exceptions:
+
+  + The ``susysone`` syntax
+  + ``overlay`` grid output
+  + The ``inherit`` option for ``global-box-sizing`` & ``border-box-sizing``
+
+
 2.1.3 - Jul 16 2014
 -------------------
 

data/sass/_su.scss

@@ -0,0 +1,4 @@
+// Su
+// ==
+
+@import 'susy/su';

data/sass/_susy.scss

@@ -1,4 +1,4 @@
 // Susy
 // ====
 
-@import "susy/language/susy";
+@import 'susy/language/susy';

data/sass/_susyone.scss

@@ -1,4 +1,4 @@
 // Susy
 // ====
 
-@import "susy/language/susyone";
+@import 'susy/language/susyone';

data/sass/susy/{math/_su.scss → _su.scss}

@@ -1,7 +1,7 @@
 // Su
 // ==
 
-@import "su/maps";
+@import "su/utilities";
 @import "su/settings";
 @import "su/validation";
 @import "su/grid";

data/sass/susy/language/_susy.scss

@@ -3,7 +3,7 @@
 
 $susy-version: 2.1;
 
-@import "../math";
+@import "../su";
 @import "../output/float";
 
 @import "susy/settings";

data/sass/susy/language/susy/_background.scss

@@ -44,7 +44,7 @@ $susy-overlay-grid-head-exists: false;
     $_image: ();
     @each $name, $layer in map-get($_output, image) {
       $_direction: if($name == baseline, to bottom, to to($_flow));
-      $_image: append($_image, linear-gradient($_direction, $layer...), comma);
+      $_image: append($_image, linear-gradient($_direction, $layer), comma);
     }
     $_output: map-merge($_output, (image: $_image));
 
@@ -61,7 +61,7 @@ $susy-overlay-grid-head-exists: false;
 @mixin overlay-grid (
   $grid: $susy
 ) {
-  @if not $susy-overlay-grid-head-exists {
+  @if not($susy-overlay-grid-head-exists) {
     @at-root head { @include overlay-head; }
     @at-root head:before { @include overlay-trigger; }
     @at-root head:hover { @include overlay-trigger-hover; }
@@ -336,18 +336,18 @@ $susy-overlay-grid-head-exists: false;
       $_sym: is-symmetrical($_columns);
       $_return: if($_sym, get-background-sym($grid), get-background-asym($grid));
       $_return: map-merge($_return, (clip: content-box));
-    } @else if not $_line-height {
+    } @else if not($_line-height) {
       @warn 'Please provide $base-line-height in order to see baseline grids.';
     }
 
     @if $_line-height {
       @if $_show != show-columns {
         $_color: variable-exists(grid-background-baseline-color);
-        $_color: if($_color, $grid-background-baseline-color, black);
+        $_color: if($_color, $grid-background-baseline-color, #000);
 
         $_image: map-get($_return, image);
         $_size: map-get($_return, size);
-        $_baseline: (baseline: ($_color 1px, rgba($_color, 0) 1px));
+        $_baseline: (baseline: ($_color 1px, transparent 1px));
         $_baseline-size: 100% $_line-height;
 
         $_return: map-merge($_return, (

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

@@ -14,7 +14,7 @@
   @if susy-get(global-box-sizing) != content-box {
     $output: map-merge((box-sizing: content-box), $output);
   }
-  
+
   @include susy-inspect(bleed, $inspect);
   @include output($output);
 }
@@ -168,7 +168,7 @@
     $four: if(length(map-keys($map)) == 4, true, false);
     $null: if(index(map-values($map), null), true, false);
 
-    @if $four and not $null {
+    @if $four and not($null) {
       $top: map-get($map, '#{$name}-top');
       $right: map-get($map, '#{$name}-right');
       $bottom: map-get($map, '#{$name}-bottom');
@@ -180,7 +180,7 @@
 
       $new: if($all, $all, null);
 
-      @if not $new {
+      @if not($new) {
         @if $tb and $rl {
           $new: $tb $rl;
         } @else if $rl {

data/sass/susy/language/susy/_box-sizing.scss

@@ -5,21 +5,34 @@
 // -----------------
 // Set a box model globally on all elements.
 // - [$box]: border-box | content-box
+// - [$inherit]: true | false
 @mixin global-box-sizing(
-  $box: susy-get(global-box-sizing)
+  $box: susy-get(global-box-sizing),
+  $inherit: false
 ) {
-	$inspect: $box;
+  $inspect: $box;
+
+  @if $inherit {
+    @at-root {
+       html { @include output((box-sizing: $box)); }
+       *, *:before, *:after { box-sizing: inherit; }
+     }
+  } @else {
+    *, *:before, *:after { @include output((box-sizing: $box)); }
+  }
 
   @include susy-inspect(global-box-sizing, $inspect);
-  *, *:before, *:after { @include output((box-sizing: $box)); }
   @include update-box-model($box);
 }
 
 // Border Box Sizing
 // -----------------
 // A legacy shortcut...
-@mixin border-box-sizing {
-  @include global-box-sizing(border-box);
+// - [$inherit]: true | false
+@mixin border-box-sizing(
+  $inherit: false
+) {
+  @include global-box-sizing(border-box, $inherit);
 }
 
 // Update Box Model

data/sass/susy/language/susy/_container.scss

@@ -49,7 +49,7 @@
   $_column-width  : susy-get(column-width, $layout);
   $_math          : susy-get(math, $layout);
 
-  @if not $_width or $_width == auto {
+  @if not($_width) or $_width == auto {
     @if valid-column-math($_math, $_column-width) {
       $_columns   : susy-get(columns, $layout);
       $_gutters   : susy-get(gutters, $layout);
@@ -72,7 +72,7 @@
 ) {
   $_return: if($justify == left, 0, auto) if($justify == right, 0, auto);
 
-  @if not index(left right center, $justify) {
+  @if not(index(left right center, $justify)) {
     $_return: nth($justify, 1);
     $_return: $_return if(length($justify) > 1, nth($justify, 2), $_return);
   }

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

@@ -27,18 +27,18 @@
   $output: (
     width             : null,
     float             : from,
-    margin_before     : null,
-    margin_after      : null,
-    padding_before    : null,
-    padding_after     : null,
+    margin-before     : null,
+    margin-after      : null,
+    padding-before    : null,
+    padding-after     : null,
     flow              : $flow,
   );
 
   @if $inside {
     $gutters: get-gutters($span);
     $output: map-merge($output, (
-      padding_before: map-get($gutters, before),
-      padding_after: map-get($gutters, after),
+      padding-before: map-get($gutters, before),
+      padding-after: map-get($gutters, after),
     ));
   }
 
@@ -52,7 +52,7 @@
   @include susy-inspect(gallery, $inspect);
 
   // Collective Output
-  @if $box == border-box or ($inside and not $box and not $global-box) {
+  @if $box == border-box or ($inside and not($box) and not($global-box)) {
     @include output((box-sizing: border-box));
   } @else if $box == content-box {
     @include output((box-sizing: content-box));
@@ -68,10 +68,10 @@
       $output: (
         width             : if($symmetrical, null, get-span-width($span)),
         float             : null,
-        margin_before     : get-isolation($span),
-        margin_after      : -100%,
-        padding_before    : null,
-        padding_after     : null,
+        margin-before     : get-isolation($span),
+        margin-after      : -100%,
+        padding-before    : null,
+        padding-after     : null,
         flow              : $flow,
       );
 

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

@@ -11,8 +11,8 @@
   $layout,
   $clean: false
 ) {
-  $inspect: $layout;
-  $susy: _get-layout($layout, $clean) !global;
+  $inspect  : $layout;
+  $susy     : _get-layout($layout, $clean) !global;
 
   @include susy-inspect(layout, $inspect);
 }
@@ -27,9 +27,9 @@
   $layout,
   $clean: false
 ) {
-  $inspect: $layout;
-  $old: $susy;
-  $susy: _get-layout($layout, $clean) !global;
+  $inspect  : $layout;
+  $old      : $susy;
+  $susy     : _get-layout($layout, $clean) !global;
 
   @include susy-inspect(with-layout, $inspect);
 

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

@@ -69,7 +69,7 @@
   $_gutters : susy-get(gutters, $context);
   $_gutter  : susy-get(gutter-override, $context);
 
-  @if $_gutters and ($_gutters > 0) and not $_gutter {
+  @if $_gutters and ($_gutters > 0) and not($_gutter) {
     $_column-width: susy-get(column-width, $context);
     $_math: gutter-math($context);
     @if $_math == static {

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

@@ -10,13 +10,14 @@
   $isolate: 1
 ) {
   $inspect: $isolate;
+
   $output: (
     push: isolate($isolate),
     flow: susy-get(flow, $isolate),
   );
 
-  @include isolate-output($output...);
   @include susy-inspect(isolate, $inspect);
+  @include isolate-output($output...);
 }
 
 
@@ -30,7 +31,7 @@
   $isolate: parse-span($isolate);
   $isolation: susy-get(span, $isolate);
 
-  @if $isolation and not get-location($isolate) {
+  @if $isolation and not(get-location($isolate)) {
     $new: (
       span: null,
       location: $isolation,
@@ -53,7 +54,7 @@
   $columns    : susy-get(columns, $input);
   $width      : null;
 
-  @if type-of($location) == number and not unitless($location) {
+  @if type-of($location) == number and not(unitless($location)) {
     $width: $location;
   } @else if $location {
     $push: $location - 1;

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

@@ -40,7 +40,7 @@
   $flow     : susy-get(flow, $context);
 
   @include susy-inspect(first, $inspect);
-  @if not is-split($context) {
+  @if not(is-split($context)) {
     @include float-first($flow);
   }
 }
@@ -65,6 +65,7 @@
 
   $output: (
     flow: susy-get(flow, $context),
+    last-flow: susy-get(last-flow, $context),
     margin: if(is-split($context), null, 0),
   );
 
@@ -87,7 +88,7 @@
   $span       : parse-span($span);
   $edge       : susy-get(edge, $span);
 
-  @if not $edge {
+  @if not($edge) {
     $count: susy-count(susy-get(columns, $span));
     $location: susy-get(location, $span);
     $n: susy-get(span, $span);
@@ -125,7 +126,7 @@
   $edge       : get-edge($span);
   $n          : susy-get(span, $span);
 
-  @if $edge and not $location and type-of($n) == number and unitless($n) {
+  @if $edge and not($location) and type-of($n) == number and unitless($n) {
     @if $edge == first {
       $location: 1;
     } @else if $edge == last {

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

@@ -1,5 +1,5 @@
 // Susy Settings
-// ==================
+// =============
 
 // Susy Language Defaults
 // ----------------------
@@ -16,7 +16,6 @@
     color: rgba(#66f, .25),
     output: background,
     toggle: top right,
-    inspect: false,
   ),
 ));
 
@@ -40,7 +39,6 @@ $susy-keywords: (
   clear: break nobreak,
   debug image: show hide show-columns show-baseline,
   debug output: background overlay,
-  debug inspect: inspect,
 );
 
 
@@ -83,7 +81,7 @@ $susy-keywords: (
   $_columns: ();
   $_gutters: null;
 
-  @if not unitless(nth(nth($short, 1), 1)) {
+  @if not(unitless(nth(nth($short, 1), 1))) {
     $_gutters: nth($short, 1);
   } @else {
     $_columns: (columns: nth($short, 1));
@@ -193,7 +191,7 @@ $susy-keywords: (
   $_gutters: parse-span($short, gutter-override);
   $_span: susy-get(gutter-override, $_gutters);
 
-  @if $_span and not map-get($_gutters, columns) {
+  @if $_span and not(map-get($_gutters, columns)) {
     $_context: ();
     $_new: ();
 

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

@@ -65,18 +65,18 @@
 
   // calculate widths
   $spread: index(map-values($span), spread);
-  $span: if($split-nest and not $spread, map-merge($span, (spread: wide)), $span);
+  $span: if($split-nest and not($spread), map-merge($span, (spread: wide)), $span);
   $width: get-span-width($span);
   $gutters: get-gutters($span);
 
   // apply gutters
   @if is-inside($span) {
-    @if not susy-get(role, $span) {
+    @if not(susy-get(role, $span)) {
       $padding-before: map-get($gutters, before);
       $padding-after: map-get($gutters, after);
     }
   } @else {
-    @if not ($split-nest) {
+    @if not($split-nest) {
       $margin-before: map-get($gutters, before);
       $margin-after: map-get($gutters, after);
     }
@@ -94,7 +94,7 @@
       $float: susy-get(last-flow, $span);
     }
 
-    @if not $is-split {
+    @if not($is-split) {
       @if $edge == full or ($edge == first and $pos == before) {
         $margin-before: 0;
       }
@@ -108,10 +108,10 @@
   @return (
     width           : $width,
     float           : $float,
-    margin_before   : $margin-before,
-    margin_after    : $margin-after,
-    padding_before  : $padding-before,
-    padding_after   : $padding-after,
+    margin-before   : $margin-before,
+    margin-after    : $margin-after,
+    padding-before  : $padding-before,
+    padding-after   : $padding-after,
     flow            : susy-get(flow, $span),
   );
 }

data/sass/susy/language/susy/_validation.scss

@@ -8,7 +8,7 @@
   $math,
   $column-width
 ) {
-  @if $math == static and not $column-width {
+  @if $math == static and not($column-width) {
     @warn 'Static math requires a valid column-width setting.';
   } @else {
     @return $column-width;

data/sass/susy/language/susyone/_functions.scss

@@ -57,8 +57,8 @@ $rem-with-px-fallback               : true !default;
   $columns  : $total-columns
 ) {
   @if round($columns) != $columns {
-    @warn "Susy works best with integer column-spans.
-    For partial-columns, you may need to finesse the math by hand using functions directly.";
+    @warn "Susy works best with integer column-spans." +
+    "For partial-columns, you may need to finesse the math by hand using functions directly.";
   }
   @return ($columns * $column-width) + (if($columns >= 1, ceil($columns - 1), 0) * $gutter-width);
 }
@@ -92,7 +92,7 @@ $rem-with-px-fallback               : true !default;
   $outerwidth: if($width, $width, columns-width($columns));
 
   @if $width {
-    @if not $border-box-sizing { $outerwidth: handle-grid-padding($outerwidth, subtract); }
+    @if not($border-box-sizing) { $outerwidth: handle-grid-padding($outerwidth, subtract); }
   } @else {
     @if $border-box-sizing { $outerwidth: handle-grid-padding($outerwidth, add); }
   }
@@ -293,7 +293,7 @@ $rem-with-px-fallback               : true !default;
         $layout     : $val;
         $has-layout : true;
       } @else {
-        @if ($has-layout) and (not $media) {
+        @if ($has-layout) and not($media) {
           $max: $val;
         } @else {
           @if $media {
@@ -319,12 +319,12 @@ $rem-with-px-fallback               : true !default;
           $min: nth($media,2);
         }
       } @else {
-        @warn "Can't compare incompatible units.
-         Using #{$min} for min-width, and #{$max} for max-width";
+        @warn "Can't compare incompatible units." +
+         "Using #{$min} for min-width, and #{$max} for max-width";
       }
       @if (length($media) > 2) {
-        @warn "You can only send two lengths: a min-width and an (optional) max-width.
-         You sent #{length($media)}: #{$media}";
+        @warn "You can only send two lengths: a min-width and an (optional) max-width." +
+         "You sent #{length($media)}: #{$media}";
       }
     }
   }

data/sass/susy/language/susyone/_media.scss

@@ -36,7 +36,7 @@
   $max          : nth($media-layout,3);
   $ie           : nth($media-layout,4);
 
-  @if (not $breakpoint-media-output) and (not $breakpoint-ie-output) and (not $breakpoint-raw-output) {
+  @if not($breakpoint-media-output) and not($breakpoint-ie-output) and not($breakpoint-raw-output) {
     @warn "Either $breakpoint-media-output, $breakpoint-ie-output, or $breakpoint-raw-output must be true for at-breakpoint to work.";
   }
 
@@ -44,7 +44,7 @@
   @if $min or $layout or $max {
 
     // If we don't have a layout, we create one based on the min-width.
-    @if not $layout {
+    @if not($layout) {
       $layout: get-layout($min);
     }
 
@@ -60,7 +60,7 @@
                 @content;
               }
             } @else {
-              @if (not $min) and (not $max) {
+              @if not($min) and not($max) {
                 // Neither $min nor $max:
                 // We can create a breakpoint based on the number of columns in the layout.
                 $min: fix-ems(container-outer-width($width: false));

data/sass/susy/output/shared/_inspect.scss

@@ -1,5 +1,8 @@
-// Susy Debug
-// ----------------
+// Debugging
+// =========
+
+// Susy Inspect
+// ------------
 // Output arguments passed to a inspect.
 // - $mixin  : <susy mixin>
 // - $inspec   : <mixin arguments>
@@ -16,4 +19,4 @@
   @if $show or susy-get(debug inspect) {
     -susy-#{$mixin}: inspect($inspect);
   }
-};
+}

data/sass/susy/output/support/_prefix.scss

@@ -13,7 +13,7 @@
   $prefix: official
 ) {
   @each $fix in $prefix {
-    $fix: if($fix == official or not $fix, $prop, '-#{$fix}-#{$prop}');
+    $fix: if($fix == official or not($fix), $prop, '-#{$fix}-#{$prop}');
     @include susy-rem($fix, $val);
   }
 }

data/sass/susy/output/support/_support.scss

@@ -13,6 +13,7 @@
   ),
 ));
 
+
 // Susy Support [mixin]
 // --------------------
 // Send property-value pairs to the proper support modules.
@@ -67,7 +68,7 @@
       @each $_i in $_req {
         $_pass: call(#{$_type}-exists, $_i);
 
-        @if not $_pass {
+        @if not($_pass) {
           $_fail: true;
           @if $warn {
             @warn "You requested custom support of #{$feature}, but the #{$_i} #{$_type} is not available.";

data/sass/susy/{math/su → su}/_grid.scss

@@ -7,7 +7,7 @@
 // Returns true if a grid is symmetrical.
 // - [$columns]   : <number> | <list>
 @function is-symmetrical(
-  $columns: map-get($susy-defaults, columns)
+  $columns: susy-get(columns)
 ) {
   $columns: valid-columns($columns);
   @return if(type-of($columns) == number, $columns, null);
@@ -19,19 +19,12 @@
 // Find the number of columns in a given layout
 // - [$columns]   : <number> | <list>
 @function susy-count(
-  $columns: map-get($susy-defaults, columns)
+  $columns: susy-get(columns)
 ) {
   $columns: valid-columns($columns);
   @return is-symmetrical($columns) or length($columns);
 }
 
-@function column-count(
-  $columns: map-get($susy-defaults, columns)
-) {
-  @warn "[function] column-count() has been renamed susy-count().";
-  @return susy-count($columns);
-}
-
 
 // Susy Sum
 // --------
@@ -40,8 +33,8 @@
 // - [$gutters]   : <ratio>
 // - [$spread]    : false/narrow | wide | wider
 @function susy-sum(
-  $columns  : map-get($susy-defaults, columns),
-  $gutters  : map-get($susy-defaults, gutters),
+  $columns  : susy-get(columns),
+  $gutters  : susy-get(gutters),
   $spread   : false
 ) {
   $columns: valid-columns($columns);
@@ -51,7 +44,7 @@
   $gutter-sum: (susy-count($columns) + $spread) * $gutters;
   $column-sum: is-symmetrical($columns);
 
-  @if not $column-sum {
+  @if not($column-sum) {
     @each $column in $columns {
       $column-sum: ($column-sum or 0) + $column;
     }
@@ -60,15 +53,6 @@
   @return $column-sum + $gutter-sum;
 }
 
-@function column-sum(
-  $columns  : map-get($susy-defaults, columns),
-  $gutters  : map-get($susy-defaults, gutters),
-  $spread   : false
-) {
-  @warn "[function] column-sum() has been renamed susy-sum().";
-  @return susy-sum($columns, $gutters, $spread);
-}
-
 
 // Susy Slice
 // ----------
@@ -79,12 +63,12 @@
 @function susy-slice(
   $span,
   $location,
-  $columns: map-get($susy-defaults, columns)
+  $columns: susy-get(columns)
 ) {
   $columns: valid-columns($columns);
   $sub-columns: $span;
 
-  @if not is-symmetrical($columns) {
+  @if not(is-symmetrical($columns)) {
     $location: $location or 1;
     $sub-columns: ();
     @for $i from $location to ($location + $span) {
@@ -95,15 +79,6 @@
   @return $sub-columns;
 }
 
-@function column-span(
-  $span,
-  $location,
-  $columns: map-get($susy-defaults, columns)
-) {
-  @warn "[function] column-span() has been renamed susy-slice().";
-  @return susy-slice($span, $location, $columns);
-}
-
 
 // Susy
 // ----
@@ -116,8 +91,8 @@
 @function susy(
   $span,
   $location     : false,
-  $columns      : map-get($susy-defaults, columns),
-  $gutters      : map-get($susy-defaults, gutters),
+  $columns      : susy-get(columns),
+  $gutters      : susy-get(gutters),
   $spread       : false
 ) {
   $columns: valid-columns($columns);
@@ -126,14 +101,3 @@
 
   @return susy-sum($span, $gutters, $spread);
 }
-
-@function column-span-sum(
-  $span,
-  $location     : false,
-  $columns      : map-get($susy-defaults, columns),
-  $gutters      : map-get($susy-defaults, gutters),
-  $spread       : false
-) {
-  @warn "[function] column-span-sum() has been renamed susy().";
-  @return susy($span, $location, $columns, $gutters, $spread);
-}

data/sass/susy/{math/su → su}/_settings.scss

@@ -1,6 +1,10 @@
 // Settings
 // ========
 
+// Version
+// -------
+$su-version: 1.1;
+
 
 // Default Settings
 // ----------------
@@ -56,7 +60,7 @@ $susy: () !default;
   $_return: null;
 
   @each $opt in $_options {
-    @if type-of($opt) == map and not $_break {
+    @if type-of($opt) == map and not($_break) {
       $_keyset: _susy-deep-has-key($opt, $key...);
       @if $_keyset {
         $_return: _susy-deep-get($opt, $key...);

data/sass/susy/{math/su/_maps.scss → su/_utilities.scss}

@@ -54,7 +54,8 @@
     $_n: 0 - $i;
     $_level: _susy-truncate-list($_keys, $_length + $_n);
     $_level: _susy-deep-get($map, $_level...);
-    $_merge: (nth($_keys, $_n): $_value);
+    $_merge: nth($_keys, $_n);
+    $_merge: ($_merge: $_value);
     $_return: if($_level, map-merge($_level, $_merge), $_merge);
     $_value: $_return;
   }
@@ -95,7 +96,7 @@
   $_stop: false;
 
   @each $key in $keys {
-    @if not $_stop {
+    @if not($_stop) {
       $_return: map-has-key($map, $key);
     }
 

data/sass/susy/{math/su → su}/_validation.scss

@@ -26,7 +26,7 @@
     $return: if($fail, $return, $columns);
   }
 
-  @if $return != $columns and not $silent {
+  @if $return != $columns and not($silent) {
     $return: null;
     $warn: '$columns must be a unitless number or list of unitless numbers.';
     @warn $warn + ' Current value [#{$type}]: #{$columns}';
@@ -48,7 +48,7 @@
 
   @if $type == number and unitless($gutters) {
     $return: $gutters;
-  } @else if not $silent {
+  } @else if not($silent) {
     $warn: '$gutters must be a unitless number.';
     @warn $warn + ' Current value [#{$type}]: #{$gutters}';
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0.beta.2
 platform: ruby
 authors:
 - Eric Suzanne
@@ -54,9 +54,10 @@ extra_rdoc_files:
 files:
 - lib/compass-susy.rb
 - lib/susy.rb
+- sass/_su.scss
 - sass/_susy.scss
 - sass/_susyone.scss
-- sass/susy/_math.scss
+- sass/susy/_su.scss
 - sass/susy/language/_susy.scss
 - sass/susy/language/_susyone.scss
 - sass/susy/language/susy/_background.scss
@@ -83,11 +84,6 @@ files:
 - sass/susy/language/susyone/_media.scss
 - sass/susy/language/susyone/_padding.scss
 - sass/susy/language/susyone/_settings.scss
-- sass/susy/math/_su.scss
-- sass/susy/math/su/_grid.scss
-- sass/susy/math/su/_maps.scss
-- sass/susy/math/su/_settings.scss
-- sass/susy/math/su/_validation.scss
 - sass/susy/output/_float.scss
 - sass/susy/output/_shared.scss
 - sass/susy/output/_support.scss
@@ -108,6 +104,10 @@ files:
 - sass/susy/output/support/_prefix.scss
 - sass/susy/output/support/_rem.scss
 - sass/susy/output/support/_support.scss
+- sass/susy/su/_grid.scss
+- sass/susy/su/_settings.scss
+- sass/susy/su/_utilities.scss
+- sass/susy/su/_validation.scss
 - templates/project/_grids.scss
 - templates/project/manifest.rb
 - templates/project/style.scss
@@ -136,9 +136,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '1.2'
+      version: 1.3.1
 requirements: []
 rubyforge_project: susy
 rubygems_version: 2.1.10

data/sass/susy/_math.scss

@@ -1,4 +0,0 @@
-// Math
-// ====
-
-@import "math/su";