susy 1.0.alpha.1 → 1.0.alpha.2

data/CHANGELOG.mkdn

@@ -5,7 +5,7 @@ v1.0.alpha.1 [May 9 2012]
 -------------------------
 
 Due to a conflict with the Compass CSS3 module, the `columns` mixin has been 
-renamed `span-columns`. For the time being, there is a deprecation warning, but it will be removed entirely in the next alpha update. You should be able to search and replace `@include columns` (or `+columns`) in your project files.
+renamed `span-columns`. In order to upgrade, you should simply search and replace `@include columns` (or `+columns`) in your project files.
 
 v1.0.alpha.0 [May 7 2012]
 -------------------------

data/README.mkdn

@@ -47,7 +47,7 @@ $grid-padding   : $gutter-width;  /* 1em padding on the grid */
 
 The basic grid is composed using two simple mixins:
 * Apply the `container` mixin to create your initial grid context. 
-* Apply the `columns` mixin to declare the width of an element on the grid.
+* Apply the `span-columns` mixin to declare the width of an element on the grid.
 
 Use the 'omega' trigger to declare elements that span the _final_ column of 
 their parent element, and pass a 'context' in nested situations. The 
@@ -66,13 +66,13 @@ For example:
   header { ... }
   */
 
-  nav { @include columns(3); }
+  nav { @include span-columns(3); }
 
   #content { 
-    @include columns(9 omega);
+    @include span-columns(9 omega);
 
-    #main { @include columns(6,9); }
-    aside { @include columns(3 omega,9); }
+    #main { @include span-columns(6,9); }
+    aside { @include span-columns(3 omega,9); }
   }
 
   footer { clear: both; }

data/REFERENCE.mkdn

@@ -63,8 +63,8 @@ $grid-padding   : $gutter-width   !default;
   - Default: `$total-columns`.
 
 ```scss
-nav { @include columns(3,12); }
-article { @include columns(9 omega,12); }
+nav { @include span-columns(3,12); }
+article { @include span-columns(9 omega,12); }
 ```
 **Span Columns**: `span-columns(<$columns> [<omega> , <$context>, <$from>])`
 - _Apply to any element to align it with the Susy Grid._
@@ -76,7 +76,7 @@ article { @include columns(9 omega,12); }
 
 ```scss
 .gallery-image { 
-  @include columns(3,9);              // each gallery-image is 3 of 9 cols.
+  @include span-columns(3,9);         // each gallery-image is 3 of 9 cols.
   &:nth-child(3n) { @include omega; } // every third image completes a row.
 }
 ```

data/Rakefile

@@ -10,7 +10,7 @@ begin
     p.url = "http://susy.oddbird.net/"
     p.author = "Eric Meyer"
     p.email = "eric@oddbird.net"
-    p.dependencies = ["compass >=0.13.alpha.0"]
+    p.dependencies = ["compass >=0.12.2.rc.0"]
   end
 
 rescue LoadError => boom

data/VERSION

@@ -1 +1 @@
-1.0.alpha.1
+1.0.alpha.2

data/sass/susy/_grid.scss

@@ -94,10 +94,9 @@
   } @else {  
     float: $from;
     margin-#{$to}: gutter($context);      
-  }
-
-  @if $legacy-support-for-ie6 {
-    display: inline;
+    @if $legacy-support-for-ie6 {
+      display: inline;
+    }
   }
 }
 

data/susy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "susy"
-  s.version = "1.0.alpha.1"
+  s.version = "1.0.alpha.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Meyer"]
-  s.date = "2012-05-10"
+  s.date = "2012-05-12"
   s.description = "Responsive web design with grids the quick and reliable way."
   s.email = "eric@oddbird.net"
   s.extra_rdoc_files = ["CHANGELOG.mkdn", "LICENSE.txt", "README.mkdn", "lib/susy.rb"]
@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<compass>, [">= 0.13.alpha.0"])
+      s.add_runtime_dependency(%q<compass>, [">= 0.12.2.rc.0"])
     else
-      s.add_dependency(%q<compass>, [">= 0.13.alpha.0"])
+      s.add_dependency(%q<compass>, [">= 0.12.2.rc.0"])
     end
   else
-    s.add_dependency(%q<compass>, [">= 0.13.alpha.0"])
+    s.add_dependency(%q<compass>, [">= 0.12.2.rc.0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: susy
 version: !ruby/object:Gem::Version 
-  hash: -3702664258
+  hash: 2004329407
   prerelease: 4
   segments: 
   - 1
   - 0
   - alpha
-  - 1
-  version: 1.0.alpha.1
+  - 2
+  version: 1.0.alpha.2
 platform: ruby
 authors: 
 - Eric Meyer
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: compass
@@ -26,13 +26,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3702664252
+        hash: 1947843481
         segments: 
         - 0
-        - 13
-        - alpha
+        - 12
+        - 2
+        - rc
         - 0
-        version: 0.13.alpha.0
+        version: 0.12.2.rc.0
   type: :runtime
   version_requirements: *id001
 description: Responsive web design with grids the quick and reliable way.