susy 1.0.5.alpha.0 → 1.0.5

data/CHANGELOG.mkdn

@@ -1,6 +1,13 @@
 Susy Changelog
 ==============
 
+v1.0.5 [Nov 27, 2012]
+---------------------
+
+* Add support for rem-units.
+* Clean-up quoted arguments.
+* Fix a few bugs related to the override settings.
+
 v1.0.4 [Nov 3, 2012]
 ---------------------
 

data/VERSION

@@ -1 +1 @@
-1.0.5.alpha.0
+1.0.5

data/sass/susy/_functions.scss

@@ -50,18 +50,18 @@ $rem-with-px-fallback               : true !default;
 //
 //  $columns  : The number of columns in the Grid Layout.
 @function container-outer-width(
-  $columns  : $total-columns
+  $columns  : $total-columns,
+  $width    : $container-width
 ) {
-  $width: columns-width($columns);
+  $outerwidth: if($width, $width, columns-width($columns));
 
-  @if $container-width {
-    $width: $container-width;
-    @if not $border-box-sizing { $width: handle-grid-padding($width, subtract); }
+  @if $width {
+    @if not $border-box-sizing { $outerwidth: handle-grid-padding($outerwidth, subtract); }
   } @else {
-    @if $border-box-sizing { $width: handle-grid-padding($width, add); }
+    @if $border-box-sizing { $outerwidth: handle-grid-padding($outerwidth, add); }
   }
 
-  @return $width;
+  @return $outerwidth;
 }
 
 // Return the percentage width of a single column in a given 'context'.

data/sass/susy/_grid.scss

@@ -21,15 +21,16 @@
 //
 //  $columns  : The number of columns in the Grid Layout.
 @mixin set-container-width(
-  $columns  : $total-columns
+  $columns  : $total-columns,
+  $style    : $container-style
 ){
   $width: container-outer-width($columns);
 
-  @if $container-style == 'static' {
+  @if $style == 'static' {
     @include if-rem(width, $width);
   } @else {
-    @if $container-style == 'fluid' {
-      @include if-rem(width, if(unit($width) == '%', $width, auto));
+    @if $style == 'fluid' {
+      @if unit($width) == '%' { @include if-rem(width, $width); }
     } @else {
       @include if-rem(max-width, $width);
       @if $legacy-support-for-ie6 {
@@ -112,6 +113,7 @@
   $padding       : false,
   $from          : $from-direction
 ) {
+  $from     : unquote($from);
   $to       : opposite-position($from);
   $pos      : split-columns-value($columns,position);
   $cols     : split-columns-value($columns,columns);
@@ -154,6 +156,7 @@
 @mixin omega(
   $from     : $from-direction
 ) {
+  $from   : unquote($from);
   $to     : opposite-position($from);
   $hack   : opposite-position($omega-float);
 
@@ -176,6 +179,7 @@
   $selector : child,
   $from     : $from-direction
 ) {
+  $from     : unquote($from);
   $ie: if($n == "first", true, false);
   @include adjust-support-for($ie6: $ie, $ie7: $ie, $ie8: $ie) {
     &:#{format-nth($n,$selector)} { @include omega($from); }
@@ -191,6 +195,7 @@
 @mixin reset-columns(
   $from: $from-direction
 ) {
+  $from   : unquote($from);
   $to     : opposite-position($from);
   $hack   : opposite-position($omega-float);
 
@@ -213,6 +218,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from   : unquote($from);
   $to     : opposite-position($from);
   $hack   : opposite-position($omega-float);
 
@@ -236,6 +242,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from     : unquote($from);
   $ie: if($n == "first", true, false);
   @include adjust-support-for($ie6: $ie, $ie7: $ie, $ie8: $ie) {
     &:#{format-nth($n,$selector)} { @include remove-omega($context,$from); }

data/sass/susy/_margin.scss

@@ -13,6 +13,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from     : unquote($from);
   margin-#{$from}: space($columns,$context);
 }
 
@@ -22,6 +23,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from     : unquote($from);
   @include pre($columns,$context,$from)
 }
 
@@ -37,6 +39,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from     : unquote($from);
   margin-#{$from}: 0 - space($columns, $context);
 }
 
@@ -52,6 +55,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from     : unquote($from);
   $to : opposite-position($from);
   margin-#{$to}: space($columns,$context);
 }
@@ -70,6 +74,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from     : unquote($from);
   @if $pre {
     @include pre($pre,$context,$from)
   }

data/sass/susy/_media.scss

@@ -66,7 +66,7 @@
             @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());
+              $min: fix-ems(container-outer-width($width: false));
             }
             @if $min {
               // Min only:

data/sass/susy/_padding.scss

@@ -12,6 +12,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from           : unquote($from);
   padding-#{$from}: space($columns, $context);
 }
 
@@ -26,6 +27,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from         : unquote($from);
   $to           : opposite-position($from);
   padding-#{$to}: space($columns, $context);
 }
@@ -42,6 +44,7 @@
   $context  : $total-columns,
   $from     : $from-direction
 ) {
+  $from     : unquote($from);
   @if $prefix {
     @include prefix($prefix, $context, $from);
   }

data/sass/susy/_settings.scss

@@ -18,6 +18,7 @@ $grid-padding       : $gutter-width   !default;
 // From Direction:
 // Controls for right-to-left or bi-directional sites.
 $from-direction     : left            !default;
+$from-direction     : unquote($from-direction);
 
 // Omega Float Direction:
 // The direction that +omega elements are floated by deafult.

data/susy.gemspec

@@ -1,28 +1,27 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{susy}
-  s.version = "1.0.5.alpha.0"
+  s.name = "susy"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Meyer"]
-  s.date = %q{2012-11-06}
-  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.date = "2012-11-28"
+  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"]
   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", "sass/susy/_units.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.homepage = "http://susy.oddbird.net/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Susy", "--main", "README.md"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{susy}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Responsive grids for Compass.}
+  s.rubyforge_project = "susy"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Responsive grids for Compass."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<compass>, [">= 0.12.2"])
       s.add_runtime_dependency(%q<sass>, [">= 3.2.0"])
     else

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: susy
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 29
+  prerelease: 
   segments: 
   - 1
   - 0
   - 5
-  - alpha
-  - 0
-  version: 1.0.5.alpha.0
+  version: 1.0.5
 platform: ruby
 authors: 
 - Eric Meyer
@@ -16,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-06 00:00:00 -07:00
-default_executable: 
+date: 2012-11-28 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
@@ -37,9 +37,11 @@ dependencies:
   name: sass
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 3
         - 2
@@ -93,7 +95,6 @@ files:
 - test/scss/margin.scss
 - test/scss/media.scss
 - test/scss/padding.scss
-has_rdoc: true
 homepage: http://susy.oddbird.net/
 licenses: []
 
@@ -108,16 +109,20 @@ 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
@@ -125,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: susy
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Responsive grids for Compass.