susy 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5b89b744ac20007a3a1d91a36a970bbffe1e99
-  data.tar.gz: 9a46e0d21945bf5a645f2b7b7c8e1c127d198d2b
+  metadata.gz: 6564f6c6ebae00408fb763ffdb3bda6ef669b9d6
+  data.tar.gz: 50860d92812e7883ebde50f1fd8ddb0a0634ce2c
 SHA512:
-  metadata.gz: db91d54a75ed724235d0e8938add1e32abfb9fe5b603806584fbe4b5998d209f1065af0ab2e3b05494b48e5efa31177429ed8c106e38c2647f9f32e96d525b5d
-  data.tar.gz: 304373902790d7558f5105948646e6cf0b14ec9ff652948ea4f56741235ad72f2b422d444fcf9518519c6e22b8acf26cb4444a12927a70ba4dab088b34f6a5c9
+  metadata.gz: ca85a0d51eff08a9b02d7453cd916933eae56b5b6e98d160b5556765aae972be68e5c615dcee7497407c0e4f421eabbe3f0f95ab92d4103e90f96cfa5e1afec5
+  data.tar.gz: 8995cf7863a664cdf6f54a3fa14db746993d51b0ff83a61915d7870e95163eb9a1e86eca0136705fe74d4eb49143f3ffe4f886ce7e0983740375d765ddd9a2ce

data/README.md

@@ -24,17 +24,3 @@ Resources
 - [Documentation](http://susydocs.oddbird.net/)
 - [Sites using Susy](http://susy.oddbird.net/sites-using-susy/)
 - [Twitter @SassSusy](http://twitter.com/Sasssusy/)
-
-Contributing
-------------
-
-We love contributions,
-both as ideas and pull requests.
-Susy is written in pure Sass,
-all contained in the `/sass/` directory.
-Everything else is just packaging.
-If you know Sass,
-or are willing to learn,
-you can contribute to Susy.
-
-More documentation on contributing to come...

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/docs/changelog.rst

@@ -1,8 +1,20 @@
 Changelog
 =========
 
+2.1.2 - Apr 28 2014
+-------------------
+
+- ``first`` and ``last`` keywords output ``0`` margins instead of ``null``
+  so they can be used to override previous span settings.
+- Output ``:before`` / ``:after`` rather than ``::before`` / ``::after``
+  to support IE8.
+- Load Susy paths in Compass if required, otherwise add it to SASS_PATH.
+  [`Adrien Antoine <https://github.com/Alshten>`_]
+- Compass 1.0 config no longer needs to ``require 'susy'``.
+  Susy is registered with Compass automatically.
+
 
-2.1.0 - Mar 13 2014
+2.1.1 - Mar 13 2014
 -------------------
 
 - Rename core math functions, and prepare for decomposition.

data/lib/susy.rb

@@ -1,10 +1,10 @@
 base_directory  = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 susy_stylesheets_path = File.join(base_directory, 'sass')
 susy_templates_path = File.join(base_directory, 'templates')
-begin
-  require 'compass'
+
+if (defined? Compass)
   Compass::Frameworks.register('susy', :stylesheets_directory => susy_stylesheets_path, :templates_directory => susy_templates_path)
-rescue LoadError
+else
   # compass not found, register on the Sass path via the environment.
   if ENV.has_key?("SASS_PATH")
     ENV["SASS_PATH"] = ENV["SASS_PATH"] + File::PATH_SEPARATOR + susy_stylesheets_path

data/sass/susy/language/_susy.scss

@@ -7,6 +7,7 @@ $susy-version: 2.0;
 @import "../output/float";
 
 @import "susy/settings";
+@import "susy/validation";
 @import "susy/grids";
 @import "susy/box-sizing";
 @import "susy/context";

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

@@ -59,7 +59,7 @@ $susy-overlay-grid-head-exists: false;
 ) {
   @if not $susy-overlay-grid-head-exists {
     @at-root head { @include overlay-head; }
-    @at-root head::before { @include overlay-trigger; }
+    @at-root head:before { @include overlay-trigger; }
     @at-root head:hover { @include overlay-trigger-hover; }
     $susy-overlay-grid-head-exists: true !global;
   }
@@ -67,7 +67,7 @@ $susy-overlay-grid-head-exists: false;
   head:hover ~ &,
   head:hover ~ body & {
     position: relative;
-    &::before {
+    &:before {
       @include grid-overlay-base;
       @include background-grid($grid);
     }
@@ -152,6 +152,7 @@ $susy-overlay-grid-head-exists: false;
   $_end           : 1 + $_gutters;
   $_after         : percentage(1/$_end);
   $_stops         : ();
+  $_size          : span(1 $grid wide);
 
   @if is-inside($grid) {
     $_stops: $_color, $_light;
@@ -164,9 +165,13 @@ $susy-overlay-grid-head-exists: false;
     $_stops: $_color, $_light $_after, $_trans $_after;
   }
 
+  @if $_math == static {
+    $_size: valid-column-math($_math, $_column-width) * $_end;
+  }
+
   $_output: (
     image: (columns: $_stops),
-    size: if($_math == static, $_column-width * $_end, span(1 $grid wide)),
+    size: $_size,
   );
 
   @return $_output;

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

@@ -8,7 +8,7 @@
 @mixin global-box-sizing(
   $box: susy-get(global-box-sizing)
 ) {
-  *, *::before, *::after { @include output((box-sizing: $box)); }
+  *, *:before, *:after { @include output((box-sizing: $box)); }
   @include update-box-model($box);
 }
 

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

@@ -45,15 +45,15 @@
   $layout         : parse-grid($layout);
   $_width         : susy-get(container, $layout);
   $_column-width  : susy-get(column-width, $layout);
+  $_math          : susy-get(math, $layout);
 
   @if not $_width or $_width == auto {
-    @if $_column-width {
+    @if valid-column-math($_math, $_column-width) {
       $_columns   : susy-get(columns, $layout);
       $_gutters   : susy-get(gutters, $layout);
       $_spread    : if(is-split($layout), wide, narrow);
       $_width     : susy-sum($_columns, $_gutters, $_spread) * $_column-width;
     } @else {
-      // if we have nothing, default to 100%
       $_width: 100%;
     }
   }

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

@@ -1,31 +1,38 @@
 // Grid Syntax
 // ===========
 
+
 // Layout
 // ------
 // Set a new layout using a shorthand
 // - $layout: <settings>
+// - $clean: boolean
 @mixin layout(
-  $layout
+  $layout,
+  $clean: false
 ) {
-  $susy: map-merge($susy, parse-grid($layout)) !global;
+  $susy: _get-layout($layout, $clean) !global;
 }
 
+
 // Use Grid
 // --------
 // Use an arbitrary layout for a section of code
 // - $layout: <settings>
+// - $clean: boolean
 @mixin with-layout(
-  $layout
+  $layout,
+  $clean: false
 ) {
   $old: $susy;
+  $susy: _get-layout($layout, $clean) !global;
 
-  @include layout($layout);
   @content;
 
   $susy: $old !global;
 }
 
+
 // Layout
 // ------
 // Return a parsed layout map based on shorthand syntax
@@ -35,3 +42,17 @@
 ) {
   @return parse-grid($layout);
 }
+
+
+// Get Layout
+// ----------
+// Return a new layout based on current and given settings
+// - $layout: <settings>
+// - $clean: boolean
+@function _get-layout(
+  $layout,
+  $clean: false
+) {
+  $layout: layout($layout);
+  @return if($clean, $layout, _susy-deep-merge($susy, $layout));
+}

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

@@ -68,8 +68,9 @@
 
   @if $_gutters and ($_gutters > 0) and not $_gutter {
     $_column-width: susy-get(column-width, $context);
-    @if $_column-width and gutter-math($context) == static {
-      $_gutter: $_gutters * $_column-width;
+    $_math: gutter-math($context);
+    @if $_math == static {
+      $_gutter: $_gutters * valid-column-math($_math, $_column-width);
     } @else {
       $_columns : susy-get(columns, $context);
       $_spread  : if(is-split($context), wide, susy-get(spread, $context));

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

@@ -86,14 +86,21 @@
     $margin-after: -100%;
   } @else if $edge {
     $is-split: is-split($span);
-    @if $edge == last or $edge == full {
-      $margin-after: if($is-split, $margin-after, null);
-    }
-    @if $edge == first or $edge == full {
-      $margin-before: if($is-split, $margin-before, null);
-    } @else if $edge == last {
+    $pos: susy-get(gutter-position, $span);
+
+    @if $edge == last {
       $float: susy-get(last-flow, $span);
     }
+
+    @if not $is-split {
+      @if $edge == full or ($edge == first and $pos == before) {
+        $margin-before: 0;
+      }
+      @if $edge == full or ($edge == last and $pos == after) {
+        $margin-after: 0;
+      }
+    }
+
   }
 
   @return (
@@ -139,8 +146,10 @@
     $spread: if(is-inside($span), $spread or wide, $spread);
     $span-sum: susy($n, $location, $columns, $gutters, $spread);
 
-    @if susy-get(math, $span) == static {
-      $width: $span-sum * susy-get(column-width, $span);
+    $_math: susy-get(math, $span);
+    $_column-width: susy-get(column-width, $span);
+    @if $_math == static {
+      $width: $span-sum * valid-column-math($_math, $_column-width);
     } @else {
       $width: percentage($span-sum / $context);
     }

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

@@ -0,0 +1,16 @@
+// Validation
+// ==========
+
+
+// Validate Column Math
+// --------------------
+@function valid-column-math(
+  $math,
+  $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/math/su/_maps.scss

@@ -63,6 +63,27 @@
 }
 
 
+// Deep Merge
+// ----------
+// Return 2 objects of any depth, merged
+@function _susy-deep-merge(
+  $map1,
+  $map2
+) {
+
+  @if type-of($map1) != map or type-of($map2) != map {
+    $map1: $map2;
+  } @else {
+    @each $key, $value in $map2 {
+      $_new: ($key: _susy_deep-merge(map-get($map1, $key), $value));
+      $map1: map-merge($map1, $_new);
+    }
+  }
+
+  @return $map1;
+}
+
+
 // Deep Has-Key
 // ------------
 // - Return true if a deep key exists

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

@@ -9,7 +9,7 @@
   @if susy-support(clearfix, (mixin: clearfix)) {
     @include clearfix;
   } @else {
-    &::after {
+    &:after {
       content: " ";
       display: block;
       clear: both;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Eric Suzanne
@@ -68,6 +68,7 @@ files:
 - sass/susy/language/susy/_rows.scss
 - sass/susy/language/susy/_settings.scss
 - sass/susy/language/susy/_span.scss
+- sass/susy/language/susy/_validation.scss
 - sass/susy/language/susyone/_background.scss
 - sass/susy/language/susyone/_functions.scss
 - sass/susy/language/susyone/_grid.scss