susy 2.0.0.beta.3 → 2.0.0.rc.1

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

@@ -23,10 +23,10 @@
     @include nobreak;
   }
 
-  @include susy-box-sizing($box);
+  @include output((box-sizing: $box));
   @include float-span-output($output...);
 
-  @if type-of($nesting) == number and unitless($nesting) {
+  @if valid-columns($nesting, silent) {
     @include nested($span) { @content; }
   } @else {
     @content;

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

@@ -190,7 +190,7 @@ $rem-with-px-fallback               : true !default;
     @if $request == 'position' {
       @return $pos;
     } @else {
-      @warn '"#{$request}"" is not a valid value for $request';
+      @warn '"#{$request}" is not a valid value for $request';
     }
   }
 }
@@ -335,7 +335,7 @@ $rem-with-px-fallback               : true !default;
 // Return the nearest layout (column-count) above a given breakpoint.
 //
 // $min : The min-width media-query breakpoint above which to establish a new layout.
-@function get-layout (
+@function get-layout( 
   $min
 ) {
   $min      : fix-ems($min);

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

@@ -27,12 +27,12 @@
   $width: container-outer-width($columns);
 
   @if $style == 'static' {
-    @include if-rem(width, $width);
+    @include rem(width, $width);
   } @else {
     @if $style == 'fluid' {
-      @if unit($width) == '%' { @include if-rem(width, $width); }
+      @if unit($width) == '%' { @include rem(width, $width); }
     } @else {
-      @include if-rem(max-width, $width);
+      @include rem(max-width, $width);
       @include for-legacy-browser(ie,"6") {
         @if unit($width) == 'rem' {
           _width: round(convert-length($width, px));
@@ -52,8 +52,8 @@
 ){
   @include pie-clearfix;
   @include set-container-width($columns);
-  @include if-rem(padding-left, $grid-padding);
-  @include if-rem(padding-right, $grid-padding);
+  @include rem(padding-left, $grid-padding);
+  @include rem(padding-right, $grid-padding);
   margin: { left: auto; right: auto; }
 }
 

data/sass/susy/math/_maps.scss

@@ -0,0 +1,89 @@
+// Map Functions
+// =============
+
+
+// Truncate List
+// -------------
+// - Return a list, truncated to a given length
+@function _susy-truncate-list(
+  $list,
+  $length
+) {
+  $_return: ();
+
+  @for $i from 1 through length($list) {
+    $_return: if($i <= $length, append($_return, nth($list, $i)), $_return);
+  }
+
+  @return $_return;
+}
+
+
+// Deep Get
+// --------
+// - Return a value deep in nested maps
+@function _susy-deep-get(
+  $map,
+  $keys...
+) {
+  $_return: $map;
+
+  @each $key in $keys {
+    @if type-of($_return) == map {
+      $_return: map-get($_return, $key);
+    }
+  }
+
+  @return $_return;
+}
+
+
+// Deep Set
+// --------
+// - Set a value deep in nested maps
+@function _susy-deep-set(
+  $map,
+  $keys-value...
+) {
+  $_value: nth($keys-value, -1);
+  $_keys: _susy-truncate-list($keys-value, length($keys-value) - 1);
+  $_length: length($_keys);
+  $_return: ();
+
+  @for $i from 1 through $_length {
+    $_n: 0 - $i;
+    $_level: _susy-truncate-list($_keys, $_length + $_n);
+    $_level: _susy-deep-get($map, $_level...);
+    $_merge: (nth($_keys, $_n): $_value);
+    $_return: if($_level, map-merge($_level, $_merge), $_merge);
+    $_value: $_return;
+  }
+
+  @return $_return;
+}
+
+
+// Deep Has-Key
+// ------------
+// - Return true if a deep key exists
+@function _susy-deep-has-key(
+  $map,
+  $keys...
+) {
+  $_return: null;
+  $_stop: false;
+
+  @each $key in $keys {
+    @if not $_stop {
+      $_return: map-has-key($map, $key);
+    }
+
+    @if $_return {
+      $map: map-get($map, $key);
+    } @else {
+      $_stop: true;
+    }
+  }
+
+  @return $_return;
+}

data/sass/susy/math/_settings.scss

@@ -5,6 +5,7 @@
 // -------
 $susy-version: 2.0;
 
+
 // Default Settings
 // ----------------
 // PRIVATE: The basic settings
@@ -13,6 +14,15 @@ $susy-defaults: (
   gutters: 1/4,
 );
 
+
+// User Settings
+// -------------
+// - Define the $susy variable with a map of your own settings.
+// - Set EITHER $column-width OR $container
+// - Use $column-width for static layouts
+$susy: () !default;
+
+
 // Susy Defaults
 // -------------
 // PRIVATE: Add defaults to Susy
@@ -21,3 +31,44 @@ $susy-defaults: (
 ) {
   $susy-defaults: map-merge($susy-defaults, $defaults) !global;
 }
+
+
+// Susy Set
+// --------
+// Change one setting
+// - $key   : setting name
+// - $value : setting value
+@mixin susy-set(
+  $key-value...
+) {
+  $susy: _susy-deep-set($susy, $key-value...) !global;
+}
+
+
+// Susy Get
+// --------
+// Return one setting from a grid
+// - $key     : <keyword>
+// - $layout  : <settings>
+@function susy-get(
+  $key,
+  $layout: map-merge($susy-defaults, $susy)
+) {
+  $layout: parse-grid($layout);
+  $_options: $layout $susy $susy-defaults;
+  $_break: false;
+  $_return: null;
+
+  @each $opt in $_options {
+    @if type-of($opt) == map and not $_break {
+      $_keyset: _susy-deep-has-key($opt, $key...);
+      @if $_keyset {
+        $_return: _susy-deep-get($opt, $key...);
+        $_break: true;
+      }
+    }
+  }
+
+  @return $_return;
+}
+

data/sass/susy/math/_validation.scss

@@ -5,7 +5,8 @@
 // -------------
 // Check that a column setting is valid.
 @function valid-columns(
-  $columns
+  $columns,
+  $silent: false
 ) {
   $type: type-of($columns);
   $return: null;
@@ -21,26 +22,31 @@
     $return: if($fail, $return, $columns);
   }
 
-  @if $return != $columns {
+  @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}';
-  } @else {
-    @return $return;
   }
+
+  @return $return;
 }
 
 // Valid Gutters
 // -------------
 // Check that a gutter setting is valid.
 @function valid-gutters(
-  $gutters
+  $gutters,
+  $silent: false
 ) {
   $type: type-of($gutters);
+  $return: null;
 
   @if $type == number and unitless($gutters) {
-    @return $gutters;
-  } @else {
+    $return: $gutters;
+  } @else if not $silent {
     $warn: '$gutters must be a unitless number.';
     @warn $warn + ' Current value [#{$type}]: #{$gutters}';
   }
+
+  @return $return;
 }

data/sass/susy/output/_float.scss

@@ -3,7 +3,6 @@
 
 @import "shared";
 
-@import "float/clearfix";
 @import "float/container";
 @import "float/span";
 @import "float/end";

data/sass/susy/output/_shared.scss

@@ -1,7 +1,9 @@
 // Shared API
 // ==========
 
-@import "shared/box-sizing";
+@import "support";
+
+@import "shared/output";
 @import "shared/direction";
 @import "shared/background";
 @import "shared/container";

data/sass/susy/output/_support.scss

@@ -0,0 +1,9 @@
+// Susy Browser Support
+// ====================
+
+@import "support/prefix";
+@import "support/background";
+@import "support/box-sizing";
+@import "support/rem";
+@import "support/clearfix";
+@import "support/support";

data/sass/susy/output/float/_end.scss

@@ -18,8 +18,12 @@
 ) {
   $to: to($flow);
 
-  float: if($last-flow == to, $to, null);
-  margin-#{$to}: $margin;
+  $output: (
+    float: if($last-flow == to, $to, null),
+    margin-#{$to}: $margin,
+  );
+
+  @include output($output);
 }
 
 // Float First
@@ -28,5 +32,9 @@
 @mixin float-first(
   $flow: map-get($susy-defaults, flow)
 ) {
-  margin-#{from($flow)}: 0;
+  $output: (
+    margin-#{from($flow)}: 0,
+  );
+
+  @include output($output);
 }

data/sass/susy/output/float/_isolate.scss

@@ -7,12 +7,16 @@
 // - [$flow]  : ltr | rtl
 @mixin isolate-output(
   $push,
-  $flow   : map-get($susy-defaults, flow)
+  $flow: map-get($susy-defaults, flow)
 ) {
-  $to     : to($flow);
-  $from   : from($flow);
+  $to: to($flow);
+  $from: from($flow);
 
-  float: $from;
-  margin-#{$from}: $push;
-  margin-#{$to}: -100%;
+  $output: (
+    float: $from,
+    margin-#{$from}: $push,
+    margin-#{$to}: -100%,
+  );
+
+  @include output($output);
 }

data/sass/susy/output/float/_span.scss

@@ -22,10 +22,14 @@
   $to     : to($flow);
   $from   : from($flow);
 
-  width: $width;
-  float: if($float == to, $to, null) or if($float == from, $from, null);
-  margin-#{$from}: $margin-before;
-  margin-#{$to}: $margin-after;
-  padding-#{$from}: $padding-before;
-  padding-#{$to}: $padding-after;
+  $output: (
+    width: $width,
+    float: if($float == to, $to, null) or if($float == from, $from, null),
+    margin-#{$from}: $margin-before,
+    margin-#{$to}: $margin-after,
+    padding-#{$from}: $padding-before,
+    padding-#{$to}: $padding-after,
+  );
+
+  @include output($output);
 }

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

@@ -10,27 +10,17 @@
 // - [$flow]: ltr | rtl
 @mixin background-grid-output (
   $image,
-  $size: false,
-  $clip: false,
+  $size: null,
+  $clip: null,
   $flow: map-get($susy-defaults, flow)
 ) {
-  @if mixin-exists(background-image) {
-    @include background-image($image...);
-  } @else {
-    background-image: $image;
-  }
+  $output: (
+    background-image: $image,
+    background-size: $size,
+    background-origin: $clip,
+    background-clip: $clip,
+    background-position: from($flow) top,
+  );
 
-  @if $size {
-    -webkit-background-size: $size;
-    background-size: $size;
-  }
-
-  @if $clip {
-    -webkit-background-origin: $clip;
-    -webkit-background-clip: $clip;
-    background-origin: $clip;
-    background-clip: $clip;
-  }
-
-  background-position: from($flow) top;
+  @include output($output);
 }

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

@@ -11,7 +11,11 @@
   $justify: auto auto,
   $property: max-width
 ) {
-  #{$property}: $width or 100%;
-  margin-left: nth($justify, 1);
-  margin-right: nth($justify, 2);
+  $output: (
+    #{$property}: $width or 100%,
+    margin-left: nth($justify, 1),
+    margin-right: nth($justify, 2),
+  );
+
+  @include output($output);
 }

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

@@ -14,6 +14,10 @@
   $to: to($flow);
   $from: from($flow);
 
-  margin-#{$from}: $before;
-  margin-#{$to}: $after;
+  $output: (
+    margin-#{$from}: $before,
+    margin-#{$to}: $after,
+  );
+
+  @include output($output);
 }

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

@@ -0,0 +1,14 @@
+// Output
+// ======
+
+// Output
+// ------
+// Output CSS with proper browser support.
+// - $styles  : <map of css property-value pairs>
+@mixin output(
+  $styles
+) {
+  @each $prop, $val in $styles {
+    @include susy-support($prop, $val);
+  }
+}