susy 2.0.0.beta.1 → 2.0.0.beta.2

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

@@ -10,11 +10,15 @@
   output: float,
   container-position: center,
   gutter-position: after,
-  show-grids: hide,
   global-box-sizing: content-box,
+  debug: (
+    image: hide,
+    color: rgba(#66f, .25),
+    output: background,
+    toggle: top right,
+  ),
 ));
 
-$nullable: gutters container-position;
 
 // Valid Keyword Values
 // --------------------
@@ -25,7 +29,6 @@ $susy-keywords: (
   output: isolate float,
   container-position: left center right,
   flow: ltr rtl,
-  show-grids: show hide show-columns show-baseline,
   gutter-position: before after split inside inside-static,
   box-sizing: border-box content-box,
   span: full,
@@ -34,8 +37,11 @@ $susy-keywords: (
   gutter-override: no-gutters no-gutter,
   role: nest,
   clear: break nobreak,
+  debug image: show hide show-columns show-baseline,
+  debug output: background overlay,
 );
 
+
 // User Settings
 // -------------
 // - Define the $susy variable with a map of your own settings.
@@ -43,6 +49,7 @@ $susy-keywords: (
 // - Use $column-width for static layouts
 $susy: () !default;
 
+
 // Parse Susy Keywords and Maps
 // ----------------------------
 @function parse-settings(
@@ -58,7 +65,7 @@ $susy: () !default;
       @if type-of($item) == string {
         @each $key, $value in $susy-keywords {
           @if index($value, $item) {
-            $return: map-merge($return, ($key: $item));
+            $return: deep-set($return, $key, $item);
           }
         }
       // maps
@@ -71,6 +78,7 @@ $susy: () !default;
   @return $return;
 }
 
+
 // Parse Columns & Gutters
 // -----------------------
 @function parse-layout(
@@ -102,6 +110,7 @@ $susy: () !default;
   @return $return;
 }
 
+
 // Parse Grid/Context
 // ------------------
 @function parse-grid(
@@ -130,6 +139,7 @@ $susy: () !default;
   @return map-merge($return, $layout);
 }
 
+
 // Parse Span
 // ----------
 @function parse-span(
@@ -179,6 +189,7 @@ $susy: () !default;
   @return $return;
 }
 
+
 // Parse Gutters
 // -------------
 @function parse-gutters(
@@ -211,26 +222,41 @@ $susy: () !default;
   @return $gutters;
 }
 
+
+// Susy Set
+// --------
+// Change one setting
+// - $key   : setting name
+// - $value : setting value
+@mixin susy-set(
+  $key,
+  $value
+) {
+  $susy: deep-set($susy, $key, $value) !global;
+}
+
+
 // Susy Get
 // --------
 // Return one setting from a grid
-// - $key   : <keyword>
-// - $grid  : <settings>
+// - $key     : <keyword>
+// - $layout  : <settings>
 @function susy-get(
   $key,
-  $grid: map-merge($susy-defaults, $susy)
+  $layout: map-merge($susy-defaults, $susy)
 ) {
-  $grid: parse-grid($grid);
-  $options: $grid $susy $susy-defaults;
-  $nullish: index($nullable, $key);
+  $layout: parse-grid($layout);
+  $options: $layout $susy $susy-defaults;
   $break: false;
   $return: null;
 
   @each $opt in $options {
-    $keyset: index(map-keys($opt), $key);
-    @if not $break {
-      $return: map-get($opt, $key);
-      $break: $return or if($keyset and $nullish, true, false);
+    @if type-of($opt) == map and not $break {
+      $keyset: deep-has-key($opt, $key...);
+      @if $keyset {
+        $return: deep-get($opt, $key...);
+        $break: true;
+      }
     }
   }
 

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

@@ -132,9 +132,12 @@
     $n: if($pos == split and $role != nest, column-count($columns), 100%);
   }
 
-  @if unitless($n) {
+  @if type-of($n) != number {
+    @warn "(#{type-of($n)}) #{$n} is not a valid span.";
+  } @else if unitless($n) {
     $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));
+    $spread: if(is-inside($span), $spread or wide, $spread);
+    $span-sum: column-span-sum($n, $location, $columns, $gutters, $spread);
 
     @if susy-get(math, $span) == static {
       $width: $span-sum * susy-get(column-width, $span);

data/sass/susy/math/_columns.scss

@@ -50,13 +50,13 @@
   @return $column-sum + $gutter-sum;
 }
 
-// Get Columns
+// Column Span
 // -----------
 // Return a subset of columns at a given location.
 // - $span        : <number>
 // - $location    : <number>
 // - [$columns]   : <number> | <list>
-@function get-columns(
+@function column-span(
   $span,
   $location,
   $columns: map-get($susy-defaults, columns)
@@ -75,15 +75,15 @@
   @return $sub-columns;
 }
 
-// Get Column Span Sum
-// -------------------
+// Column Span Sum
+// ---------------
 // Find the sum of a column-span.
 // - $span        : <number>
-// - $location    : first | last | <number>
+// - $location    : <number>
 // - [$columns]   : <number> | <list>
 // - [$gutters]   : <ratio>
-// - [$spread]    : <boolean>
-@function get-column-span-sum(
+// - [$spread]    : false/narrow | wide | wider
+@function column-span-sum(
   $span,
   $location     : false,
   $columns      : map-get($susy-defaults, columns),
@@ -92,7 +92,7 @@
 ) {
   $columns: valid-columns($columns);
   $gutters: valid-gutters($gutters);
-  $span: get-columns($span, $location, $columns);
+  $span: column-span($span, $location, $columns);
 
   @return column-sum($span, $gutters, $spread);
 }

data/sass/susy/math/_settings.scss

@@ -10,8 +10,7 @@ $susy-version: 2.0;
 // PRIVATE: The basic settings
 $susy-defaults: (
   columns: 4,
-  gutters: .25,
-  column-width: false,
+  gutters: 1/4,
 );
 
 // Susy Defaults

data/sass/susy/math/_validation.scss

@@ -44,19 +44,3 @@
     @warn $warn + ' Current value [#{$type}]: #{$gutters}';
   }
 }
-
-// Valid Column-Width
-// ------------------
-// Check that a column-width setting is valid.
-@function valid-column-width(
-  $column-width
-) {
-  $type: type-of($column-width);
-
-  @if ($type == number and unit($column-width)) or not $column-width {
-    @return $column-width;
-  } @else {
-    $warn: '$column-width must be a length (number with units), or false.';
-    @warn $warn + ' Current value [#{$type}]: #{$column-width}';
-  }
-}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Eric Meyer
@@ -53,22 +53,10 @@ files:
 - lib/compass-susy.rb
 - lib/susy.rb
 - sass/_susy.scss
-- sass/susy/_helpers.scss
 - sass/susy/_math.scss
-- sass/susy/api/_float.scss
-- sass/susy/api/_shared.scss
-- sass/susy/api/float/_clearfix.scss
-- sass/susy/api/float/_container.scss
-- sass/susy/api/float/_end.scss
-- sass/susy/api/float/_isolate.scss
-- sass/susy/api/float/_span.scss
-- sass/susy/api/shared/_background.scss
-- sass/susy/api/shared/_box-sizing.scss
-- sass/susy/api/shared/_container.scss
-- sass/susy/api/shared/_direction.scss
-- sass/susy/api/shared/_margins.scss
-- sass/susy/api/shared/_padding.scss
+- sass/susy/language/_shared.scss
 - sass/susy/language/_susy.scss
+- sass/susy/language/shared/_maps.scss
 - sass/susy/language/susy/_background.scss
 - sass/susy/language/susy/_bleed.scss
 - sass/susy/language/susy/_box-sizing.scss
@@ -85,9 +73,21 @@ files:
 - sass/susy/language/susy/_settings.scss
 - sass/susy/language/susy/_span.scss
 - sass/susy/math/_columns.scss
-- sass/susy/math/_container.scss
 - sass/susy/math/_settings.scss
 - sass/susy/math/_validation.scss
+- sass/susy/output/_float.scss
+- sass/susy/output/_shared.scss
+- sass/susy/output/float/_clearfix.scss
+- sass/susy/output/float/_container.scss
+- sass/susy/output/float/_end.scss
+- sass/susy/output/float/_isolate.scss
+- sass/susy/output/float/_span.scss
+- sass/susy/output/shared/_background.scss
+- sass/susy/output/shared/_box-sizing.scss
+- sass/susy/output/shared/_container.scss
+- sass/susy/output/shared/_direction.scss
+- sass/susy/output/shared/_margins.scss
+- sass/susy/output/shared/_padding.scss
 - templates/project/_base.scss
 - templates/project/manifest.rb
 - templates/project/screen.scss

data/sass/susy/_helpers.scss

@@ -1,6 +0,0 @@
-// Helpers
-// =======
-
-@import "helpers/clearfix";
-@import "helpers/box-sizing";
-@import "helpers/direction";

data/sass/susy/math/_container.scss

@@ -1,20 +0,0 @@
-// Container math
-// ==============
-
-// Calculate Container Width
-// -------------------------
-// Calculate the width of a container based on columns and gutters.
-// - [$columns]       : <number> | <list>
-// - [$gutters]       : <ratio>
-// - [$column-width]  : <length>
-// - [$spread]        : <boolean>
-@function calculate-container-width(
-  $columns        : map-get($susy-defaults, columns),
-  $gutters        : map-get($susy-defaults, gutters),
-  $column-width   : map-get($susy-defaults, column-width),
-  $spread         : false
-) {
-  $sum: column-sum($columns, $gutters, $spread);
-  $column-width: valid-column-width($column-width);
-  @return $sum * $column-width;
-}