singularitygs 1.0.7 → 1.0.8

data/lib/singularitygs.rb

@@ -4,6 +4,6 @@ require 'breakpoint'
 Compass::Frameworks.register("singularitygs", :path => "#{File.dirname(__FILE__)}/..")
 
 module SingularityGS
-  VERSION = "1.0.7"
-  DATE = "2013-04-10"
+  VERSION = "1.0.8"
+  DATE = "2013-04-25"
 end

data/stylesheets/singularitygs/api/_float.scss

@@ -119,15 +119,19 @@
     $grid: nth($grid, 1);
   }
 
-  @if type-of($grid) == 'number' and length($grid) == 1 {
-    @if $location == 'last' or $location == 'omega' {
-      $location: $grid - $span + 1;
-    }
-    @else {
-      @if $location == 'first' or $location == 'alpha' {
-        $row: true;
+  // Working with a symmetric grid
+  @if type-of($grid) == 'number' {
+    // Special treatment for non-numeric location
+    @if type-of($location) != 'number' {
+      @if $location == 'last' or $location == 'omega' {
+        $location: $grid - $span + 1;
+      }
+      @else {
+        @if $location == 'first' or $location == 'alpha' {
+          $row: true;
+        }
+        $location: 1;
       }
-      $location: 1;
     }
 
     @include grid-span($span, $location, $grid, $gutter, 'float');
@@ -136,6 +140,7 @@
       clear: both;
     }
   }
+  // Working with an asymmetric grid, should have location provided
   @else if type-of($grid) == 'list' and $location != false {
     @include grid-span($span, $location, $grid, $gutter, 'float');
   }

data/stylesheets/singularitygs/grids/_find.scss

@@ -13,5 +13,11 @@
     $user-columns: 12;
   }
 
-  @return find-object($grids, $user-columns);
+  $found: find-object($grids, $user-columns);
+
+  @if length($found) == 1 {
+    $found: nth($found, 1);
+  }
+
+  @return $found;
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Scott Kellum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-10 00:00:00 -04:00
+date: 2013-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency