susy 1.0.3 → 1.0.4

data/CHANGELOG.mkdn

@@ -1,6 +1,12 @@
 Susy Changelog
 ==============
 
+v1.0.4 [Nov 3, 2012]
+---------------------
+
+* Fix bug in nested mixins that adjust support (e.g. `nth-omeg` inside `at-breakpoint`).
+* Remove non-ie experimental support in `at-breakpoint` ie-fallback output.
+
 v1.0.3 [Oct 20, 2012]
 ---------------------
 

data/Manifest

@@ -13,17 +13,20 @@ sass/susy/_margin.scss
 sass/susy/_media.scss
 sass/susy/_padding.scss
 sass/susy/_settings.scss
+sass/susy/_support.scss
 susy.gemspec
 templates/project/_base.scss
 templates/project/manifest.rb
 templates/project/screen.scss
 test/config.rb
 test/css/background.css
+test/css/functions.css
 test/css/grid.css
 test/css/margin.css
 test/css/media.css
 test/css/padding.css
 test/scss/background.scss
+test/scss/functions.scss
 test/scss/grid.scss
 test/scss/margin.scss
 test/scss/media.scss

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/sass/_susy.scss

@@ -1,63 +1,10 @@
-// ---------------------------------------------------------------------------
-// Helpers
-// @@@ These only live here until they land in Compass.
-
-// Change the experimental-support settings in specific contexts.
-@mixin set-experimental-support($moz: false, $webkit: false, $ms: false, $o: false, $khtml: false) {
-  $experimental-support-for-mozilla: $moz;
-  $experimental-support-for-webkit: $webkit;
-  $experimental-support-for-microsoft: $ms;
-  $experimental-support-for-opera: $o;
-  $experimental-support-for-khtml: $khtml;
-}
-
-// Change the legacy-support-for-ie* settings in specific contexts.
-@mixin set-legacy-ie-support($ie6: false, $ie7: false, $ie8: false) {
-  $legacy-support-for-ie6: $ie6;
-  $legacy-support-for-ie7: $ie7;
-  $legacy-support-for-ie8: $ie8;
-}
-
-// This mixin allows you to change the experimental support settings for
-// child (@content) styles.
-@mixin with-only-support-for($moz: false, $webkit: false, $ms: false, $o: false, $khtml: false, $legacy-ie: false) {
-  // Capture the current state
-  $original-moz: $experimental-support-for-mozilla;
-  $original-webkit: $experimental-support-for-webkit;
-  $original-o: $experimental-support-for-opera;
-  $original-ms: $experimental-support-for-microsoft;
-  $original-khtml: $experimental-support-for-khtml;
-  $original-ie6: $legacy-support-for-ie6;
-  $original-ie7: $legacy-support-for-ie7;
-  $original-ie8: $legacy-support-for-ie8;
-  // Change support settings
-  @include set-experimental-support($moz, $webkit, $ms, $o, $khtml);
-  @include set-legacy-ie-support($legacy-ie, $legacy-ie, $legacy-ie);
-  // Apply styles
-  @content;
-  // Return to original support settings
-  @include set-legacy-ie-support($original-ie6, $original-ie7, $original-ie8);
-  @include set-experimental-support($original-moz, $original-webkit, $original-ms, $original-o, $original-khtml);
-}
-
-// This mixin is a shortcut for making slight adjustments to browser support
-// for child (@content) styles
-@mixin adjust-support-for(
-    $moz: $experimental-support-for-mozilla,
-    $webkit: $experimental-support-for-webkit,
-    $ms: $experimental-support-for-microsoft,
-    $o: $experimental-support-for-opera,
-    $khtml: $experimental-support-for-khtml,
-    $legacy-ie: $legacy-support-for-ie
-) {
-  @include with-only-support-for($moz, $webkit, $ms, $o, $khtml, $legacy-ie) {
-    @content;
-  }
-}
-
 // ---------------------------------------------------------------------------
 // Partials
 
+// temporary
+@import "susy/support";
+
+// permanent
 @import "susy/settings";
 @import "susy/functions";
 @import "susy/grid";

data/sass/susy/_grid.scss

@@ -170,7 +170,7 @@
   $from     : $from-direction
 ) {
   $ie: if($n == "first", true, false);
-  @include adjust-support-for($legacy-ie: $ie) {
+  @include adjust-support-for($ie6: $ie, $ie7: $ie, $ie8: $ie) {
     &:#{format-nth($n,$selector)} { @include omega($from); }
   }
 }
@@ -230,7 +230,7 @@
   $from     : $from-direction
 ) {
   $ie: if($n == "first", true, false);
-  @include adjust-support-for($legacy-ie: $ie) {
+  @include adjust-support-for($ie6: $ie, $ie7: $ie, $ie8: $ie) {
     &:#{format-nth($n,$selector)} { @include remove-omega($context,$from); }
   }
 }

data/sass/susy/_media.scss

@@ -53,31 +53,35 @@
       // Set our new layout context.
       @include layout($layout) {
         @if $breakpoint-media-output {
-          @include adjust-support-for($legacy-ie: false) {
-            @if $min and $max {
-              // Both $min and $max
-              @media (min-width: $min) and (max-width: $max) {
+          // Capture current state of ie support and set new
+          $atbreak-legacy-ie-matrix: capture-legacy-ie-matrix();
+          @include set-legacy-ie-support;
+
+          @if $min and $max {
+            // Both $min and $max
+            @media (min-width: $min) and (max-width: $max) {
+              @content;
+            }
+          } @else {
+            @if (not $min) and (not $max) {
+              // Neither $min nor $max:
+              // We can create a breakpoint based on the number of columns in the layout.
+              $min: fix-ems(container-outer-width());
+            }
+            @if $min {
+              // Min only:
+              @media (min-width: $min) {
                 @content;
               }
             } @else {
-              @if (not $min) and (not $max) {
-                // Neither $min nor $max:
-                // We can create a breakpoint based on the number of columns in the layout.
-                $min: fix-ems(container-outer-width());
-              }
-              @if $min {
-                // Min only:
-                @media (min-width: $min) {
-                  @content;
-                }
-              } @else {
-                // Max only:
-                @media (max-width: $max) {
-                  @content;
-                }
+              // Max only:
+              @media (max-width: $max) {
+                @content;
               }
             }
           }
+          // Return legacy-ie support to original
+          @include set-legacy-ie-support($atbreak-legacy-ie-matrix...);
         }
         // Set an IE fallback
         @if $ie and $breakpoint-ie-output {
@@ -85,7 +89,10 @@
             $ie: 'lt-ie9';
           }
           .#{$ie} & {
+            $atbreak-experimental-matrix: capture-experimental-matrix();
+            @include set-experimental-support($ms: true);
             @content;
+            @include set-experimental-support($atbreak-experimental-matrix...);
           }
         }
 

data/sass/susy/_support.scss

@@ -0,0 +1,198 @@
+// @@@ These helpers only live here until they land in Compass.
+
+// ---------------------------------------------------------------------------
+// Imports
+
+@import "compass/support";
+
+// ---------------------------------------------------------------------------
+// Helpers
+
+// A debug tool for checking browser support
+@mixin debug-support-matrix($experimental: true, $ie: true) {
+  @debug  #{'$moz—'}$experimental-support-for-mozilla
+          #{'$webkit—'}$experimental-support-for-webkit
+          #{'$microsoft—'}$experimental-support-for-microsoft
+          #{'$opera—'}$experimental-support-for-opera
+          #{'$khtml—'}$experimental-support-for-khtml;
+  @debug  #{'$ie6—'}$legacy-support-for-ie6
+          #{'$ie7—'}$legacy-support-for-ie7
+          #{'$ie8—'}$legacy-support-for-ie8;
+}
+
+// Capture the current exerimental support settings
+@function capture-experimental-matrix() {
+  @return $experimental-support-for-mozilla
+          $experimental-support-for-webkit
+          $experimental-support-for-microsoft
+          $experimental-support-for-opera
+          $experimental-support-for-khtml;
+}
+
+// Capture the current legacy-ie support settings
+@function capture-legacy-ie-matrix() {
+  @return $legacy-support-for-ie6
+          $legacy-support-for-ie7
+          $legacy-support-for-ie8;
+}
+
+// Capture and store support
+$experimental-matrix: capture-experimental-matrix();
+$legacy-ie-matrix: capture-legacy-ie-matrix();
+
+@mixin capture-experimental-matrix {
+  $experimental-matrix: capture-experimental-matrix();
+}
+
+@mixin capture-legacy-ie-matrix {
+  $legacy-ie-matrix: capture-legacy-ie-matrix();
+}
+
+@mixin capture-support-matrix {
+  @include capture-experimental-matrix;
+  @include capture-legacy-ie-matrix;
+}
+
+// Change the experimental-support settings in specific contexts.
+@mixin set-experimental-support(
+  $moz    : false,
+  $webkit : false,
+  $ms     : false,
+  $o      : false,
+  $khtml  : false
+) {
+  $experimental-support-for-mozilla   : $moz;
+  $experimental-support-for-webkit    : $webkit;
+  $experimental-support-for-microsoft : $ms;
+  $experimental-support-for-opera     : $o;
+  $experimental-support-for-khtml     : $khtml;
+}
+
+@mixin capture-and-set-experimental(
+  $moz    : false,
+  $webkit : false,
+  $ms     : false,
+  $o      : false,
+  $khtml  : false
+) {
+  @include capture-experimental-matrix;
+  @include set-experimental-support($moz, $webkit, $ms, $o, $khtml);
+}
+
+@mixin capture-and-adjust-experimental(
+  $moz    : $experimental-support-for-mozilla,
+  $webkit : $experimental-support-for-webkit,
+  $ms     : $experimental-support-for-microsoft,
+  $o      : $experimental-support-for-opera,
+  $khtml  : $experimental-support-for-khtml
+) {
+  @include capture-experimental-matrix;
+  @include set-experimental-support($moz, $webkit, $ms, $o, $khtml);
+}
+
+// Change the legacy-support-for-ie* settings in specific contexts.
+@mixin set-legacy-ie-support(
+  $ie6: false,
+  $ie7: false,
+  $ie8: false
+) {
+  $legacy-support-for-ie6: $ie6;
+  $legacy-support-for-ie7: $ie7;
+  $legacy-support-for-ie8: $ie8;
+}
+
+@mixin capture-and-set-legacy-ie(
+  $ie6: false,
+  $ie7: false,
+  $ie8: false
+) {
+  @include capture-legacy-ie-matrix;
+  @include set-legacy-ie-support($ie6, $ie7, $ie8);
+}
+
+@mixin capture-and-adjust-legacy-ie(
+  $ie6: $legacy-support-for-ie6,
+  $ie7: $legacy-support-for-ie7,
+  $ie8: $legacy-support-for-ie8
+) {
+  @include capture-and-set-legacy-ie($ie6, $ie7, $ie8);
+}
+
+// Capture current browser support matrix, and set a new matrix of support.
+@mixin capture-and-set-support(
+  $moz    : false,
+  $webkit : false,
+  $ms     : false,
+  $o      : false,
+  $khtml  : false,
+  $ie6    : false,
+  $ie7    : false,
+  $ie8    : false
+) {
+  // Capture the current state
+  @include capture-support-matrix;
+
+  // Change support settings
+  @include set-experimental-support($moz, $webkit, $ms, $o, $khtml);
+  @include set-legacy-ie-support($ie6, $ie7, $ie8);
+}
+
+// Capture current browser support matrix, and set a new matrix of support.
+@mixin capture-and-adjust-support(
+  $moz        : $experimental-support-for-mozilla,
+  $webkit     : $experimental-support-for-webkit,
+  $ms         : $experimental-support-for-microsoft,
+  $o          : $experimental-support-for-opera,
+  $khtml      : $experimental-support-for-khtml,
+  $ie6        : $legacy-support-for-ie6,
+  $ie7        : $legacy-support-for-ie7,
+  $ie8        : $legacy-support-for-ie8
+) {
+  @include capture-and-set-support($moz, $webkit, $ms, $o, $khtml, $ie6, $ie7, $ie8);
+}
+
+
+// This mixin allows you to change the experimental support settings for
+// child (@content) styles.
+@mixin with-only-support-for(
+  $moz    : false,
+  $webkit : false,
+  $ms     : false,
+  $o      : false,
+  $khtml  : false,
+  $ie6    : false,
+  $ie7    : false,
+  $ie8    : false
+) {
+  // Capture current state
+  $wo-experimental-matrix : capture-experimental-matrix();
+  $wo-legacy-ie-matrix    : capture-legacy-ie-matrix();
+
+  // Set new states
+  @include set-experimental-support($moz, $webkit, $ms, $o, $khtml);
+  @include set-legacy-ie-support($ie6, $ie7, $ie8);
+
+  // Apply styles
+  @content;
+
+  // Return to original support settings
+  @include set-experimental-support($wo-experimental-matrix...);
+  @include set-legacy-ie-support($wo-legacy-ie-matrix...);
+}
+
+// This mixin is a shortcut for making slight adjustments to browser support
+// for child (@content) styles
+@mixin adjust-support-for(
+    $moz        : $experimental-support-for-mozilla,
+    $webkit     : $experimental-support-for-webkit,
+    $ms         : $experimental-support-for-microsoft,
+    $o          : $experimental-support-for-opera,
+    $khtml      : $experimental-support-for-khtml,
+    $ie6        : $legacy-support-for-ie6,
+    $ie7        : $legacy-support-for-ie7,
+    $ie8        : $legacy-support-for-ie8
+) {
+  @include with-only-support-for($moz, $webkit, $ms, $o, $khtml, $ie6, $ie7, $ie8) {
+    @content;
+  }
+}

data/susy.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{susy}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Meyer"]
-  s.date = %q{2012-10-20}
+  s.date = %q{2012-11-03}
   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"]
-  s.files = ["CHANGELOG.mkdn", "LICENSE.txt", "Manifest", "README.md", "Rakefile", "VERSION", "lib/susy.rb", "sass/_susy.scss", "sass/susy/_background.scss", "sass/susy/_functions.scss", "sass/susy/_grid.scss", "sass/susy/_margin.scss", "sass/susy/_media.scss", "sass/susy/_padding.scss", "sass/susy/_settings.scss", "susy.gemspec", "templates/project/_base.scss", "templates/project/manifest.rb", "templates/project/screen.scss", "test/config.rb", "test/css/background.css", "test/css/grid.css", "test/css/margin.css", "test/css/media.css", "test/css/padding.css", "test/scss/background.scss", "test/scss/grid.scss", "test/scss/margin.scss", "test/scss/media.scss", "test/scss/padding.scss"]
+  s.files = ["CHANGELOG.mkdn", "LICENSE.txt", "Manifest", "README.md", "Rakefile", "VERSION", "lib/susy.rb", "sass/_susy.scss", "sass/susy/_background.scss", "sass/susy/_functions.scss", "sass/susy/_grid.scss", "sass/susy/_margin.scss", "sass/susy/_media.scss", "sass/susy/_padding.scss", "sass/susy/_settings.scss", "sass/susy/_support.scss", "susy.gemspec", "templates/project/_base.scss", "templates/project/manifest.rb", "templates/project/screen.scss", "test/config.rb", "test/css/background.css", "test/css/functions.css", "test/css/grid.css", "test/css/margin.css", "test/css/media.css", "test/css/padding.css", "test/scss/background.scss", "test/scss/functions.scss", "test/scss/grid.scss", "test/scss/margin.scss", "test/scss/media.scss", "test/scss/padding.scss"]
   s.homepage = %q{http://susy.oddbird.net/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Susy", "--main", "README.md"]
   s.require_paths = ["lib"]

data/test/css/functions.css

@@ -0,0 +1,7 @@
+.container-outer-width-default {
+  width: 59em;
+}
+
+.container-outer-width-explicit {
+  width: 39em;
+}

data/test/css/media.css

@@ -26,12 +26,33 @@
     display: table;
     clear: both;
   }
+  .breakpoint .nth-omega:nth-child(3n) {
+    float: right;
+    margin-right: 0;
+  }
 }
 @media (min-width: 30em) and (max-width: 60em) {
   .breakpoint .break60-8-30 {
     max-width: 39em;
   }
 }
+@media (min-width: 119em) {
+  .breakpoint .break-ltie9 {
+    max-width: 119em;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    -ms-border-radius: 5px;
+    -o-border-radius: 5px;
+    border-radius: 5px;
+  }
+}
+.lt-ie9 .breakpoint .break-ltie9 {
+  max-width: 119em;
+  _width: 119em;
+  *zoom: 1;
+  -ms-border-radius: 5px;
+  border-radius: 5px;
+}
 
 .with-settings6-3-2-1 {
   *zoom: 1;

data/test/scss/functions.scss

@@ -0,0 +1,15 @@
+// ---------------------------------------------------------------------------
+// Imports
+
+@import "../../sass/susy";
+
+// ---------------------------------------------------------------------------
+// Functions
+
+.container-outer-width-default {
+  width: container-outer-width();
+}
+
+.container-outer-width-explicit {
+  width: container-outer-width(8);
+}

data/test/scss/media.scss

@@ -2,6 +2,7 @@
 // Imports
 
 @import "../../sass/susy";
+@import "compass/css3/border-radius";
 
 // ---------------------------------------------------------------------------
 // Media
@@ -13,11 +14,20 @@
 .breakpoint{
   @include at-breakpoint(6) {
     .break6 { @include container; }
+    .nth-omega { @include nth-omega(3n); }
   }
 
   @include at-breakpoint(60em 8 30em) {
     .break60-8-30 { @include set-container-width; }
   }
+
+  @include at-breakpoint(24 lt-ie9) {
+    .break-ltie9 {
+      @include set-container-width;
+      @include has-layout; // test adjustments to experimental support
+      @include border-radius; // test adjustments to experimental support
+    }
+  }
 }
 
 @include with-grid-settings(6,3em,2em,1em) {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Eric Meyer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-20 00:00:00 -06:00
+date: 2012-11-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,17 +72,20 @@ files:
 - sass/susy/_media.scss
 - sass/susy/_padding.scss
 - sass/susy/_settings.scss
+- sass/susy/_support.scss
 - susy.gemspec
 - templates/project/_base.scss
 - templates/project/manifest.rb
 - templates/project/screen.scss
 - test/config.rb
 - test/css/background.css
+- test/css/functions.css
 - test/css/grid.css
 - test/css/margin.css
 - test/css/media.css
 - test/css/padding.css
 - test/scss/background.scss
+- test/scss/functions.scss
 - test/scss/grid.scss
 - test/scss/margin.scss
 - test/scss/media.scss