susy 2.0.0.alpha.2 → 2.0.0.alpha.3

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

@@ -1,15 +1,15 @@
 // Susy 1.0 Settings
 // =================
 
-$total-columns      : 12;
-$column-width       : 4em;
-$gutter-width       : 1em;
-$grid-padding       : $gutter-width;
+$total-columns      : 12              !default;
+$column-width       : if($column-width, $column-width, 4em);
+$gutter-width       : 1em             !default;
+$grid-padding       : $gutter-width   !default;
 
-$from-direction     : left;
-$container-width    : false;
+$from-direction     : left            !default;
+$container-width    : false           !default;
 
-$container-style    : magic;
+$container-style    : magic           !default;
 
 // no translation (yet)
 // --------------------
@@ -17,15 +17,9 @@ $container-style    : magic;
 // $omega-float        : opposite-position($from-direction);
 // $border-box-sizing  : false;
 
-// $breakpoint-media-output  : true;
-// $breakpoint-ie-output     : true;
-// $breakpoint-raw-output    : false;
-
-// from compass
-// ------------
-
-$show-column-grid-backgrounds: true;
-$show-grid-backgrounds: true;
+// $breakpoint-media-output  : true       !default;
+// $breakpoint-ie-output     : true       !default;
+// $breakpoint-raw-output    : false      !default;
 
 // translation mixin
 // -----------------
@@ -38,20 +32,16 @@ $show-grid-backgrounds: true;
   $column-width: $column-width;
   $flow: if($from-direction == right, rtl, ltr);
 
-  $isolate: false;
-  $gutter-placement: after;
-  $show-grids: $show-grid-backgrounds or $show-column-grid-backgrounds;
-
   @if $container-style == static {
-    $static: static;
+    $layout-math: static;
     @if $container-width {
       @warn "For static output, we use your $column-width setting and ignore any $container-width override.";
     }
   } @else {
-    $static: false;
-    $container: $container-width;
+    $layout-math: fluid;
 
     @if $container-width {
+      $container: $container-width;
       $column-width: false;
     } @else if $container-style == fluid and unit($column-width) != '%' {
       $container: 100%;

data/sass/susy/math/_columns.scss

@@ -1,7 +1,10 @@
 // Column math
 // ===========
 
-// Returns true if a grid is symmetrical
+// Is Symmetrical
+// --------------
+// Returns true if a grid is symmetrical.
+// - [$columns]   : <number> | <list>
 @function is-symmetrical(
   $columns: $columns
 ) {
@@ -12,7 +15,10 @@
   }
 }
 
+// Columns Count
+// -------------
 // Find the number of columns in a given layout
+// - [$columns]   : <number> | <list>
 @function column-count(
   $columns: $columns
 ) {
@@ -25,7 +31,12 @@
   @return $count;
 }
 
+// Column Sum
+// ----------
 // Find the total sum of column-units in a layout
+// - [$columns]   : <number> | <list>
+// - [$gutters]   : <ratio>
+// - [$outer]     : <boolean>
 @function column-sum(
   $columns  : $columns,
   $gutters  : $gutters,
@@ -51,7 +62,12 @@
   @return $column-sum + $gutter-sum;
 }
 
-// Return a subset of columns at a given location
+// Get Columns
+// -----------
+// Return a subset of columns at a given location.
+// - $span        : <number>
+// - $location    : first | last | <number>
+// - [$columns]   : <number> | <list>
 @function get-columns(
   $span,
   $location,
@@ -73,7 +89,14 @@
   @return $sub-columns;
 }
 
-// Find the sum of a column-span
+// Get Column Span Sum
+// -------------------
+// Find the sum of a column-span.
+// - $span        : <number>
+// - $location    : first | last | <number>
+// - [$columns]   : <number> | <list>
+// - [$gutters]   : <ratio>
+// - [$outer]     : <boolean>
 @function get-column-span-sum(
   $span,
   $location     : false,

data/sass/susy/math/_container.scss

@@ -1,7 +1,10 @@
 // Container math
 // ==============
 
-// Parse the $container-position into margin values
+// Parse Container Position
+// ------------------------
+// Parse the $container-position into margin values.
+// - [$justify]   : left | center | right | <length> [<length>]
 @function parse-container-position(
   $justify: $container-position
 ) {
@@ -11,35 +14,37 @@
   @if type-of($justify) == list {
     $left: nth($justify,1);
     $right: nth($justify,2);
-  } @else if type-of($justify) == number and not unitless($justify) {
-    $left: $justify;
-    $right: $justify;
   } @else if $justify == left {
     $left: 0;
+    $right: auto;
   } @else if $justify == right {
+    $left: auto;
     $right: 0;
   } @else if $justify == center {
     $left: auto;
     $right: auto;
+  } @else {
+    $left: $justify;
+    $right: $justify;
   }
 
   @return $left $right;
 }
 
-// Calculate the width of a container based on columns and gutters
+// Calculate Container Width
+// -------------------------
+// Calculate the width of a container based on columns and gutters.
+// - [$columns]       : <number> | <list>
+// - [$gutters]       : <ratio>
+// - [$column-width]  : <length>
+// - [$outer]         : <boolean>
 @function calculate-container-width(
   $columns        : $columns,
   $gutters        : $gutters,
   $column-width   : $column-width,
   $outer          : false
 ) {
-  $width: null;
-
-  @if $column-width {
-    $width: column-sum($columns, $gutters, $outer) * $column-width;
-  } @else {
-    @warn "We need either `$column-width` or `$container` in order to create your container.";
-  }
+  $width: column-sum($columns, $gutters, $outer) * $column-width;
 
   @return $width;
 }

data/sass/susy/math/_location.scss

@@ -1,7 +1,12 @@
 // Location math
 // =============
 
+// Is Last
+// -------
 // Find if a span covers the last columns
+// - $span        : <number>
+// - $location    : first | last | <number>
+// - [$columns]   : <number> | <list>
 @function is-last(
   $span,
   $location,
@@ -18,7 +23,10 @@
   @return $is-last;
 }
 
+// Is First
+// --------
 // Find if a span covers the first columns
+// - $location    : first | last | <number>
 @function is-first(
   $location
 ) {
@@ -29,7 +37,12 @@
   }
 }
 
+// Get Location Position
+// ---------------------
 // Return a numeric location, even if a first/last keyword is used
+// - $span        : <number>
+// - $location    : first | last | <number>
+// - [$columns]   : <number> | <list>
 @function get-location-position(
   $span,
   $location,

metadata

@@ -1,15 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: susy
 version: !ruby/object:Gem::Version 
-  hash: -1173656864
-  prerelease: 6
-  segments: 
-  - 2
-  - 0
-  - 0
-  - alpha
-  - 2
-  version: 2.0.0.alpha.2
+  version: 2.0.0.alpha.3
 platform: ruby
 authors: 
 - Eric Meyer
@@ -24,21 +16,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-03 00:00:00 Z
+date: 2013-07-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 12
-        - 2
         version: 0.12.2
   type: :runtime
   version_requirements: *id001
@@ -46,15 +32,9 @@ dependencies:
   name: sass
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 2
-        - 0
         version: 3.2.0
   type: :runtime
   version_requirements: *id002
@@ -96,7 +76,6 @@ files:
 - sass/susy/api/shared/_padding.scss
 - sass/susy/helpers/_direction.scss
 - sass/susy/helpers/_nth.scss
-- sass/susy/helpers/_sass-lists.scss
 - sass/susy/language/_shared.scss
 - sass/susy/language/_susy.scss
 - sass/susy/language/_susy1.scss
@@ -104,10 +83,11 @@ files:
 - sass/susy/language/shared/_settings.scss
 - sass/susy/language/susy/_background.scss
 - sass/susy/language/susy/_container.scss
-- sass/susy/language/susy/_functions.scss
 - sass/susy/language/susy/_gallery.scss
+- sass/susy/language/susy/_gutters.scss
 - sass/susy/language/susy/_isolate.scss
-- sass/susy/language/susy/_math.scss
+- sass/susy/language/susy/_margins.scss
+- sass/susy/language/susy/_padding.scss
 - sass/susy/language/susy/_rows.scss
 - sass/susy/language/susy/_span.scss
 - sass/susy/language/susy1/_settings.scss
@@ -248,6 +228,8 @@ files:
 homepage: http://susy.oddbird.net/
 licenses: []
 
+metadata: {}
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -259,28 +241,19 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
       version: "1.2"
 requirements: []
 
 rubyforge_project: susy
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Responsive grids for Sass & Compass.

data/sass/susy/helpers/_sass-lists.scss

@@ -1,90 +0,0 @@
-// List helpers
-// ============
-
-// Return the sum of all items in a list.
-@function list-sum(
-  $list
-) {
-  $sum: 0;
-
-  @each $item in $list {
-    $sum: $sum + $item;
-  }
-
-  @return $sum;
-}
-
-// Return list of index locations where a query appears in a list,
-// including unit queries.
-@function query-list(
-  $list,
-  $query,
-  $mode: none
-) {
-  $return: ();
-
-  @for $i from 1 through length($list) {
-    @if $mode == unit {
-      @if unit(nth($list, $i)) == $query {
-        $return: append($return, $i);
-      }
-    }
-    @else {
-      @if nth(nth($list, $i), 1) == $query {
-        $return: append($return, $i);
-      }
-    }
-  }
-
-  @if $return == () {
-    $return: false;
-  }
-
-  @return $return;
-}
-
-// Reverses direction of a list
-@function reverse(
-  $list
-) {
-  $length: length($list);
-  $return: ();
-
-  @for $i from 0 to $length {
-    $return: append($return, nth($list, $length - $i), comma);
-  }
-
-  @return $return;
-}
-
-// Return a list with specific items removed
-@function filter(
-  $list,
-  $target
-) {
-  $clean: compact();
-
-  @if index($list, $target) {
-    @each $item in $list {
-      $clean: if($item == $target, $clean, append($clean, $item));
-    }
-  } @else {
-    $clean: $list;
-  }
-
-  @return $clean;
-}
-
-@function nth-filter(
-  $list,
-  $index
-) {
-  $clean: compact();
-
-  @each $item in $list {
-    $clean: if(index($list, $item) == $index, $clean, append($clean, $item));
-  }
-
-  @return $clean;
-}
-

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

@@ -1,58 +0,0 @@
-// Math Functions
-// ==============
-
-// Return the width of a span
-@function span(
-  $span: 1
-) {
-  $span               : parse-span($span);
-
-  $width              : get-span-setting(span, $span);
-
-  $this-location      : get-span-setting(location, $span);
-  $this-columns       : get-span-setting(columns, $span);
-  $this-gutters       : get-span-setting(gutters, $span);
-  $this-column-width  : get-span-setting(column-width, $span);
-  $this-static        : get-span-setting(static, $span);
-
-  $this-location      : if($this-location, $this-location, 1);
-  $this-columns       : if($this-columns, $this-columns, $columns);
-  $this-gutters       : if($this-gutters, $this-gutters, $gutters);
-  $this-column-width  : if($this-column-width, $this-column-width, $column-width);
-  $this-static        : if($this-static, $this-static, $static);
-
-  $width: get-span-width($width, $this-location, $this-columns, $this-gutters, $this-column-width, $this-static);
-
-  @return $width;
-}
-
-// Return the width of a gutter
-@function gutter(
-  $context: get-grid()
-) {
-  $context            : parse-grid($context);
-
-  $this-columns       : get-setting(columns, $context);
-  $this-gutters       : get-setting(gutters, $context);
-  $this-column-width  : get-setting(column-width, $context);
-  $this-static        : get-setting(static, $context);
-
-  $this-columns       : if($this-columns, $this-columns, $columns);
-  $this-gutters       : if($this-gutters, $this-gutters, $gutters);
-  $this-column-width  : if($this-column-width, $this-column-width, $column-width);
-  $this-static        : if($this-static, $this-static, $static);
-
-  $width: get-gutter-width($this-columns, $this-gutters, $this-column-width, $this-static);
-
-  @return $width;
-}
-
-// Return the width of a span, plus any attached gutters
-@function outer-span(
-  $span: 1
-) {
-  $width    : span($span);
-  $gutter   : gutter($span);
-
-  @return $width + $gutter;
-}