susy 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc14459d3f8e30bffdf267e2a64f5f9eb2885ead
-  data.tar.gz: 984d1a8e29226a15571fdea3d7c7c03a41c1ab42
+  metadata.gz: 0ec94e166f503a29e85c720693fe2d02eab5b403
+  data.tar.gz: 538bace5cd040f0650cb26a8c0a1d3bfaca68a8a
 SHA512:
-  metadata.gz: c950cfa592fb081c255ddc119d5bd4d88c766f1db5afff7e14a669867a02afec554723f6dba26b579d802ca61e954ac4eaa71012f247a90d2b3af8ba5f628cb3
-  data.tar.gz: 933d1c4a62cb3a67765dd2dff5e4962d111bc24242128852ab298313cc865b1d34f035f0dab5d963f693bc67220fcba484273efd5450081740060bb4e1d1376a
+  metadata.gz: 8e92698ee16b42e2450535a55cd9890014bbf5b250377355215e20630a8c45bf17bd4527a1439ebe1c695a9c2f480dbda8fddf34ccf08fe7b21050d557bfae6c
+  data.tar.gz: 7e582b7df5fe578f92525d65338a0083724764b4610cb646811e4b8a305053c1dee00d6ea73d254ae7bd8aaa2cd8e48d03e847159508866b55f5eb972648ff3d

data/VERSION

@@ -1 +1 @@
-2.2.4
+2.2.5

data/docs/changelog.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2.2.6 - Sep 1 2015
+------------------
+
+- Fix a bug with overlay grids.
+- Fix a bug with 0-width split gutters.
+- Other small bug fixes.
+
+
 2.2.5 - May 14 2015
 -------------------
 

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

@@ -15,7 +15,7 @@ $susy-overlay-grid-head-exists: false;
   $_output: debug-get(output, $grid);
 
   @include susy-inspect(show-grid, $inspect);
-  @if $_output == overlay {
+  @if $_output == overlay and susy-get(debug image, $grid) != hide {
     @include overlay-grid($grid);
   } @else {
     @include background-grid($grid);
@@ -329,39 +329,38 @@ $susy-overlay-grid-head-exists: false;
   $_show    : susy-get(debug image, $grid);
   $_return  : ();
 
-  @if $_show and $_show != hide {
-    $_line-height: variable-exists(base-line-height);
-    $_line-height: if($_line-height, $base-line-height, false);
+  @if $_show and $_show != 'hide' {
     $_columns: susy-get(columns, $grid);
 
-    @if $_show != show-baseline {
+    @if $_show != 'show-baseline' {
       $_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) {
-      @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, #000);
+    @if $_show != 'show-columns'
+      and global-variable-exists(base-line-height)
+      and type-of($base-line-height) == 'number'
+      and not unitless($base-line-height) {
+      $_color: variable-exists('grid-background-baseline-color');
+      $_color: if($_color, $grid-background-baseline-color, #000);
 
-        $_image: map-get($_return, image);
-        $_size: map-get($_return, size);
-        $_baseline: (baseline: ($_color 1px, transparent 1px));
-        $_baseline-size: 100% $_line-height;
+      $_image: map-get($_return, image);
+      $_size: map-get($_return, size);
+      $_baseline: (baseline: ($_color 1px, transparent 1px));
+      $_baseline-size: 100% $base-line-height;
 
-        $_return: map-merge($_return, (
-          image: if($_image, map-merge($_image, $_baseline), $_baseline),
-          size: if($_size, ($_size, $_baseline-size), $_baseline-size),
-        ));
-      }
+      $_return: map-merge($_return, (
+        image: if($_image, map-merge($_image, $_baseline), $_baseline),
+        size: if($_size, ($_size, $_baseline-size), $_baseline-size),
+      ));
 
-      @if $_show == show {
+      @if $_show == 'show' {
         $_clip: map-get($_return, clip);
         $_return: map-merge($_return, (clip: join($_clip, border-box, comma)));
       }
+    } @else if $_show == 'show-baseline' {
+      @warn 'Please provide a $base-line-height with the desired height and units';
     }
   }
 

data/sass/susy/language/susy/_breakpoint-plugin.scss

@@ -122,8 +122,12 @@ $_susy-media-context: ();
   $name
 ) {
   @if map-has-key($susy-media, $name) {
-    $name: map-get($susy-media, $name);
-    $name: susy-get-media($name);
+    $map-value: map-get($susy-media, $name);
+    @if ($name == $map-value) {
+      $name: $map-value;
+    } @else {
+      $name: susy-get-media($map-value);
+    }
   }
 
   @return $name;

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

@@ -68,7 +68,8 @@
     }
   }
 
-  @if susy-get(gutter-position, $input) == split {
+  @if susy-get(gutter-position, $input) == split
+      and susy-get(gutters, $input) > 0 {
     $width: if($width == null, gutters($input), $width + gutters($input));
   }
 

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

@@ -12,7 +12,9 @@
   $span   : map-merge((spread: wide), parse-span($span));
   $flow   : susy-get(flow, $span);
   $split  : if(susy-get(gutter-position, $span) == split, true, false);
-  $width  : if($split, span($span) + gutter($span), span($span));
+  $gutter : gutter($span);
+  $span   : span($span);
+  $width  : if($split and $gutter, $span + $gutter, $span);
 
   @include susy-inspect(pre, $inspect);
   @include margin-output($width, null, $flow);

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

@@ -98,8 +98,8 @@
     }
 
   } @else {
-    @warn "You need to provide either a valid layout (number of columns)
-    or a valid media-query min-width breakpoint (length).";
+    @warn "You need to provide either a valid layout (number of columns)"
+        + "or a valid media-query min-width breakpoint (length).";
   }
 
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Eric Suzanne