susy 1.0.6 → 1.0.7

data/CHANGELOG.mkdn

@@ -1,8 +1,13 @@
 Susy Changelog
 ==============
 
+v1.0.7 [March 19, 2013]
+-----------------------
+
+* Fix edge-case where `$container-style` and `$container-width` cause conflict.
+
 v1.0.6 [March 18, 2013]
----------------------
+-----------------------
 
 * Add `isolate` and `isolate-grid` mixins.
 * Add `bleed` mixin.

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/sass/susy/_functions.scss

@@ -29,6 +29,24 @@ $rem-with-px-fallback               : true !default;
   @return $clean;
 }
 
+// ---------------------------------------------------------------------------
+// Don't use static output when it will break things
+
+// Switch element-level output to fluid, when container-width is wrong for static
+//
+// fix-static-misalignment([$style, $width])
+// - $style: $container-style.
+// - $width: $container-width.
+@function fix-static-misalignment(
+  $style: $container-style,
+  $width: $container-width
+) {
+  @if $container-width and $container-width != container-outer-width($width: false) {
+    $style: fluid;
+  }
+  @return $style;
+}
+
 // ---------------------------------------------------------------------------
 // Grid Functions
 
@@ -88,7 +106,7 @@ $rem-with-px-fallback               : true !default;
 //  $style    : The container style to use.
 @function column(
   $context  : $total-columns,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   @return if($style == static, $column-width, relative-width($column-width, $context));
 }
@@ -101,7 +119,7 @@ $rem-with-px-fallback               : true !default;
 @function columns(
   $columns,
   $context  : $total-columns,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   @return if($style == static, columns-width($columns), relative-width(columns-width($columns), $context));
 }
@@ -112,7 +130,7 @@ $rem-with-px-fallback               : true !default;
 //  $style    : The container style to use.
 @function gutter(
   $context  : $total-columns,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   @return if($style == static, $gutter-width, relative-width($gutter-width, $context));
 }
@@ -137,7 +155,7 @@ $rem-with-px-fallback               : true !default;
 @function space(
   $columns,
   $context  : $total-columns,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   @return columns($columns, $context, $style) + if($columns >= 1, gutter($context), 0);
 }

data/sass/susy/_grid.scss

@@ -112,7 +112,7 @@
   $context       : $total-columns,
   $padding       : false,
   $from          : $from-direction,
-  $style         : $container-style
+  $style         : fix-static-misalignment()
 ) {
   $from     : unquote($from);
   $to       : opposite-position($from);

data/susy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "susy"
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Meyer"]
-  s.date = "2013-03-18"
+  s.date = "2013-03-20"
   s.description = "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 = "eric@oddbird.net"
   s.extra_rdoc_files = ["CHANGELOG.mkdn", "LICENSE.txt", "README.md", "lib/susy.rb"]

data/test/css/grid.css

@@ -114,3 +114,19 @@
   *margin-left: -1em;
   display: inline;
 }
+
+/* ---------------------------------------------------------------------------
+/* Static output */
+.static {
+  width: 9em;
+  float: left;
+  margin-right: 1em;
+  display: inline;
+}
+
+.force-fluid {
+  width: 15.25424%;
+  float: left;
+  margin-right: 1.69492%;
+  display: inline;
+}

data/test/scss/grid.scss

@@ -57,3 +57,20 @@
 
 // Reset $border-box-sizing so it doesn't have other effects
 $border-box-sizing: false;
+
+/* ---------------------------------------------------------------------------
+/* Static output */
+
+$container-style: static;
+
+.static {
+  @include span-columns(2);
+}
+
+.force-fluid {
+  $container-width: 960px;
+  @include span-columns(2);
+  $container-width: false;
+}
+
+$container-style: magic;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: susy
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Eric Meyer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-18 00:00:00 Z
+date: 2013-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: compass