susy 1.0.7 → 1.0.8

data/CHANGELOG.mkdn

@@ -1,6 +1,11 @@
 Susy Changelog
 ==============
 
+v1.0.8 [March 25, 2013]
+-----------------------
+
+* Fix more edge mixed-unit conflicts with `container-style: static`.
+
 v1.0.7 [March 19, 2013]
 -----------------------
 

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/sass/susy/_functions.scss

@@ -157,7 +157,7 @@ $rem-with-px-fallback               : true !default;
   $context  : $total-columns,
   $style    : fix-static-misalignment()
 ) {
-  @return columns($columns, $context, $style) + if($columns >= 1, gutter($context), 0);
+  @return columns($columns, $context, $style) + if($columns >= 1, gutter($context, $style), 0);
 }
 
 // Accept a list including column-count and (optional) position.

data/sass/susy/_grid.scss

@@ -217,7 +217,7 @@
 @mixin remove-omega(
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from   : unquote($from);
   $to     : opposite-position($from);
@@ -243,7 +243,7 @@
   $selector : child,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from     : unquote($from);
   $ie: if($n == "first", true, false);

data/sass/susy/_isolation.scss

@@ -10,7 +10,7 @@
   $location,
   $context: $total-columns,
   $from: $from-direction,
-  $style: $container-style
+  $style: fix-static-misalignment()
 ) {
   $to: opposite-position($from);
   margin-#{$to}: -100%;
@@ -26,7 +26,7 @@
   $columns,
   $context: $total-columns,
   $from: $from-direction,
-  $style: $container-style
+  $style: fix-static-misalignment()
 ) {
   $to: opposite-position($from);
   $location: 1;

data/sass/susy/_margin.scss

@@ -13,7 +13,7 @@
   $columns,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from     : unquote($from);
   margin-#{$from}: space($columns, $context, $style);
@@ -24,10 +24,10 @@
   $columns,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from     : unquote($from);
-  @include pre($columns,$context,$from)
+  @include pre($columns, $context, $from, $style);
 }
 
 // Apply negative 'columns' margin before an element to pull it along the grid.
@@ -42,7 +42,7 @@
   $columns,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from     : unquote($from);
   margin-#{$from}: 0 - space($columns, $context, $style);
@@ -60,7 +60,7 @@
   $columns,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from     : unquote($from);
   $to : opposite-position($from);
@@ -81,7 +81,7 @@
   $post     : false,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from     : unquote($from);
   @if $pre {

data/sass/susy/_padding.scss

@@ -12,7 +12,7 @@
   $columns,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from           : unquote($from);
   padding-#{$from}: space($columns, $context, $style);
@@ -29,7 +29,7 @@
   $columns,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from         : unquote($from);
   $to           : opposite-position($from);
@@ -48,7 +48,7 @@
   $suffix   : false,
   $context  : $total-columns,
   $from     : $from-direction,
-  $style    : $container-style
+  $style    : fix-static-misalignment()
 ) {
   $from     : unquote($from);
   @if $prefix {
@@ -69,7 +69,7 @@
 @mixin bleed(
   $width: $grid-padding,
   $sides: left right,
-  $style: $container-style
+  $style: fix-static-misalignment()
 ) {
   @if $border-box-sizing { @include box-sizing(content-box) }
 

data/susy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "susy"
-  s.version = "1.0.7"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Meyer"]
-  s.date = "2013-03-20"
+  s.date = "2013-03-25"
   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

@@ -129,4 +129,6 @@
   float: left;
   margin-right: 1.69492%;
   display: inline;
+  margin-left: 8.47458%;
+  margin-right: 8.47458%;
 }

data/test/scss/grid.scss

@@ -70,6 +70,7 @@ $container-style: static;
 .force-fluid {
   $container-width: 960px;
   @include span-columns(2);
+  @include squish(1,1);
   $container-width: false;
 }
 

metadata

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