singularitygs 0.0.2 → 0.0.3

data/lib/singularitygs.rb

@@ -4,7 +4,7 @@ Compass::Frameworks.register("singularitygs", :path => "#{File.dirname(__FILE__)
 
 module CompassExtension
   
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
   DATE = "2012-06-23"
 
 end

data/stylesheets/singularitygs/_grid-test.sass

@@ -1,10 +1,7 @@
 =test-grid($columns: $columns, $gutter: $gutter, $padding: $padding, $prefix: a, $opacity: .5)
   .test-grid
-    position: relative
-    height: 100%
+    height: 200px
     width: 100%
-    min-height: 200px
-    margin-bottom: -100%
   $grid-counter: 1
   @for $i from 1 through column-count($columns)
     .test.#{$prefix}#{$i}

data/stylesheets/singularitygs/_mixins.sass

@@ -35,18 +35,31 @@ $grid-counter: 1
     $grid-counter: 1
   @else
     margin-right: $gutter
-  @if $padding != 0
-    +grid-padding($padding)
 
 
 // This writes classes, IDs, or silent objects for you to extend or use in your HTML. They can be written to different breakpoints to extend or call into your HTML as needed.
 =grid-objects($prefix: a, $columns: $columns, $gutter: $gutter, $padding: $padding, $selector: "%")
   // counter keeps track of the starting position
   $count: 0
+  %column
+    float: left
+    +grid-padding($padding)
+    margin-right: $gutter
+    
   @for $i from 1 through column-count($columns)
-    @for $n from 1 through column-count($columns) - $count
-      #{$selector}#{$prefix}#{$n}-#{$count + 1}
-        +grid-span($n, $count + 1, $columns, $gutter, $padding)
+    @for $n from $count + 1 through column-count($columns)
+      #{$selector}#{$prefix}#{$count}-#{$n}
+        @extend %column
+        width: grid-span($n - $count, $count + 1, $columns, $gutter)
+        @if $n == column-count($columns)
+          margin-right: 0
+        // add special padding
+        @if type-of($columns) == list
+          @if type-of(nth($columns, $count + 1)) == list
+            padding-left: nth(nth($columns, $count + 1), 2)
+          // add special right padding
+          @if type-of(nth($columns, ($n))) == list
+            padding-right: nth(nth($columns, ($n)), 2)
     $count: $count + 1
 
 
@@ -55,3 +68,4 @@ $grid-counter: 1
 =grid-padding($padding)
   @if $padding != 0
     padding: 0 $padding
+    +box-sizing(border-box)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: singularitygs
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Scott Kellum