susy 1.0 → 1.0.1

data/CHANGELOG.mkdn

@@ -1,6 +1,13 @@
 Susy Changelog
 ==============
 
+v1.0.1 [Sept 12, 2012]
+----------------------
+
+* Fix a bug in the relationship between `$container-width` and `$border-box-sizing`,
+  so that grid-padding is subtracted from the width in certain cases.
+* Reset right margin to `auto` rather than `0` with `remove-omega`.
+
 v1.0 [Aug 14, 2012]
 -------------------
 

data/VERSION

@@ -1 +1 @@
-1.0
+1.0.1

data/sass/susy/_functions.scss

@@ -25,13 +25,41 @@ $browser-default-font-size-pt       : 12pt;
   @return ($columns * $column-width) + (if($columns >= 1, ceil($columns - 1), 0) * $gutter-width);
 }
 
+// Return the grid width after adding or subtracting grid padding
+//
+// $width     : the width of the grid without padding;
+// $operation : ( add | subtract ) if padding should be added or subtracted;
+@function handle-grid-padding(
+  $width,
+  $operation : subtract
+) {
+  $pad: $grid-padding*2;
+
+  @if comparable($width, $grid-padding) {
+    $width: if($operation == subtract, $width - $pad, $width + $pad);
+  } @else {
+    @warn "$grid-padding must be set in units comparable to the container width.";
+  }
+
+  @return $width;
+}
+
 // Return the full outer width of a Container element.
 //
 //  $columns  : The number of columns in the Grid Layout.
 @function container-outer-width(
   $columns  : $total-columns
 ) {
-  @return columns-width($columns) + $grid-padding*2;
+  $width: columns-width();
+
+  @if $container-width {
+    $width: $container-width;
+    @if not $border-box-sizing { $width: handle-grid-padding($width, subtract); }
+  } @else {
+    @if $border-box-sizing { $width: handle-grid-padding($width, add); }
+  }
+
+  @return $width;
 }
 
 // Return the percentage width of a single column in a given 'context'.
@@ -41,7 +69,6 @@ $browser-default-font-size-pt       : 12pt;
   $context : $total-columns
 ) {
   @return relative-width($column-width, $context);
-
 }
 
 // Return the percentage width of multiple 'columns' in a given 'context'.
@@ -259,22 +286,19 @@ $browser-default-font-size-pt       : 12pt;
 @function get-layout (
   $min
 ) {
-  $default-layout : $total-columns;
-  $total-columns  : 1;
-  $layout-width   : container-outer-width();
+  $columns        : 1;
+  $layout-width   : container-outer-width($columns);
   $return         : false;
   $min            : fix-ems($min);
 
   @if comparable($min, $layout-width) {
     @while $min >= $layout-width {
-      $total-columns  : $total-columns + 1;
-      $layout-width   : container-outer-width();
+      $columns        : $columns + 1;
+      $layout-width   : container-outer-width($columns);
     }
-    $return : $total-columns;
+    $return : $columns;
   }
 
-  $total-columns : $default-layout;
-
   @return $return;
 }
 

data/sass/susy/_grid.scss

@@ -18,15 +18,12 @@
 // Container
 
 // Set the width of a container
-@mixin set-container-width(){
-  $width: if($container-width, $container-width, columns-width());
-  @if $border-box-sizing {
-    @if comparable($width, $grid-padding) {
-      $width: $width + ($grid-padding*2);
-    } @else {
-      @warn "$grid-padding must be set in units comparable to column and gutter widths, in order for $border-box-sizing to work properly.";
-    }
-  }
+//
+//  $columns  : The number of columns in the Grid Layout.
+@mixin set-container-width(
+  $columns  : $total-columns
+){
+  $width: container-outer-width($columns);
 
   @if $container-style == 'static' {
     width: $width;
@@ -35,17 +32,19 @@
       width: if(unit($width) == '%', $width, auto);
     } @else {
       max-width: $width;
-      @if $legacy-support-for-ie6 {
-        _width: $width;
-      }
+      @if $legacy-support-for-ie6 { _width: $width; }
     }
   }
 }
 
 // Set the outer grid-containing element(s).
-@mixin apply-container(){
+//
+//  $columns  : The number of columns in the container.
+@mixin apply-container(
+  $columns  : $total-columns
+){
   @include pie-clearfix;
-  @include set-container-width;
+  @include set-container-width($columns);
   margin: { left: auto; right: auto; }
   padding: { left: $grid-padding; right: $grid-padding; }
 }
@@ -211,7 +210,7 @@
   margin-#{$to}: gutter($context);
 
   @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
-    #margin-#{$hack}: 0;
+    #margin-#{$hack}: auto;
   }
 }
 

data/susy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{susy}
-  s.version = "1.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Meyer"]
-  s.date = %q{2012-08-14}
+  s.date = %q{2012-09-11}
   s.description = %q{Susy grids are fluid on the inside, ready to respond at any moment, but contained in the candy shell of your choice, so they respond how and when and where you want them to. We don't design your site or dictate your markup, we just do the math and get out of your way.}
   s.email = %q{eric@oddbird.net}
   s.extra_rdoc_files = ["CHANGELOG.mkdn", "LICENSE.txt", "README.md", "lib/susy.rb"]

data/test/css/grid.css

@@ -27,7 +27,7 @@
   display: table;
   clear: both;
 }
-@media (min-width: 71em) {
+@media (min-width: 69em) {
   .complex-container {
     max-width: 69em;
   }
@@ -76,13 +76,13 @@
 .remove-omega {
   float: left;
   margin-right: 1.69492%;
-  #margin-left: 0;
+  #margin-left: auto;
 }
 
 .remove-nth-omega:last-child {
   float: left;
   margin-right: 1.69492%;
-  #margin-left: 0;
+  #margin-left: auto;
 }
 
 /* ---------------------------------------------------------------------------

data/test/css/media.css

@@ -13,7 +13,7 @@
   clear: both;
 }
 
-@media (min-width: 31em) {
+@media (min-width: 29em) {
   .breakpoint .break6 {
     max-width: 29em;
     margin-left: auto;

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  version: "1.0"
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Eric Meyer
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-14 00:00:00 -06:00
+date: 2012-09-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency