singularitygs 1.0.alpha.1 → 1.0.alpha.2

data/lib/singularitygs.rb

@@ -5,6 +5,6 @@ require 'breakpoint'
 Compass::Frameworks.register("singularitygs", :path => "#{File.dirname(__FILE__)}/..")
 
 module SingularityGS
-  VERSION = "1.0.alpha.1"
-  DATE = "2012-11-06"
+  VERSION = "1.0.alpha.2"
+  DATE = "2012-12-02"
 end

data/stylesheets/singularitygs/_grid-plugins.scss

@@ -1,3 +1,4 @@
 @import "grid-plugins/compound";
+@import "grid-plugins/gridset";
 @import "grid-plugins/ratio-spiral";
 @import "grid-plugins/ratio";

data/stylesheets/singularitygs/_gutter.scss

@@ -24,7 +24,7 @@
 @function gutter-offset($gutter, $columns) {
 
   // if the gutter is a percent, convert it to a ratio
-  @if unit($gutter) == percentage {
+  @if unit($gutter) == '%' {
     $gutter: percentage-gutter-conversion($gutter, $columns);
   }
 
@@ -35,7 +35,7 @@
 @function gutter-span($gutter, $columns) {
   
   // if the gutter is a percent, convert it to a ratio
-  @if unit($gutter) == percentage {
+  @if unit($gutter) == '%' {
     $gutter: percentage-gutter-conversion($gutter, $columns);
   }
 

data/stylesheets/singularitygs/grid-plugins/_gridset.scss

@@ -0,0 +1,16 @@
+// import gridset directly into Singularity.
+
+// Grid by grid import is easy, parsing mixins for breakpoints is more diffucult.
+@mixin import-gridset-grid($prefix) {
+  $columns: gs-grid($prefix);
+  $gutter: gs-gutter($prefix);
+}
+
+
+// Need a variable with a list of prefixes and functions.
+// Also need funcitons that list breakpoints to parse.
+@mixin import-gridset() {
+  // @for each $grid in $gs-prefixes {
+  //   placeholder
+  // }
+}

data/stylesheets/singularitygs/helpers/_alphabet.scss

@@ -0,0 +1 @@
+$alphabet: a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z;

data/stylesheets/singularitygs/mixins/_grid-build.scss

@@ -1,6 +1,4 @@
 @mixin grid-build($span, $location, $columns, $gutter, $padding, $output) {
-  
-  
   @include grid-structure($output, $span, $location, $columns, $gutter, $padding);
   
   // bump up the counter

data/stylesheets/singularitygs/mixins/_grid-span.scss

@@ -2,11 +2,33 @@
 
 // This step folds in multiple grids and figures out what should
 // be loaded and figures out what breakpoint you are at.
-@mixin grid-span($span, $location, $columns: false, $gutter-span: false, $padding-span: false, $output: $output) {
+@mixin grid-span($span, $location: false, $columns: false, $gutter-span: false, $padding-span: false, $output: $output) {
+  
+  $error: false;
+  
+  @if $output != 'float' and $location == false {
+    @warn 'Location is required for #{$output} based grids';
+    $error: true;
+  }
+  @else {
+    $columns: find-grid($columns);
+    
+    @if $location == 'last' {
+      $location: $columns - $span + 1;
+    }
+    @else if type-of($columns) != 'number' and $location == false {
+      @warn 'Location is required for asymmetric grids!';
+      $error: true;
+    }
+    @else if type-of($columns) == 'number' and $output == 'float' {
+      $location: 1;
+    }
+  }
+  
+  @if $error == false {
+    $gutter-span: find-gutter($gutter-span);
+    $padding-span: find-padding($padding-span, $span, $location, $columns);
 
-  $columns: find-grid($columns);
-  $gutter-span: find-gutter($gutter-span);
-  $padding-span: find-padding($padding-span, $span, $location, $columns);
-
-  @include grid-build($span, $location, $columns, $gutter-span, $padding-span, $output);
+    @include grid-build($span, $location, $columns, $gutter-span, $padding-span, $output);
+  }
 }

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - alpha
-  - 1
-  version: 1.0.alpha.1
+  - 2
+  version: 1.0.alpha.2
 platform: ruby
 authors: 
 - Scott Kellum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-06 00:00:00 -05:00
+date: 2012-12-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - stylesheets/singularitygs/_helpers.scss
 - stylesheets/singularitygs/_mixins.scss
 - stylesheets/singularitygs/grid-plugins/_compound.scss
+- stylesheets/singularitygs/grid-plugins/_gridset.scss
 - stylesheets/singularitygs/grid-plugins/_ratio-spiral.scss
 - stylesheets/singularitygs/grid-plugins/_ratio.scss
 - stylesheets/singularitygs/grid-structure/_display-table.scss
@@ -105,6 +106,7 @@ files:
 - stylesheets/singularitygs/grid-structure/_float.scss
 - stylesheets/singularitygs/grid-structure/_grid-layout.scss
 - stylesheets/singularitygs/grid-structure/_isolation.scss
+- stylesheets/singularitygs/helpers/_alphabet.scss
 - stylesheets/singularitygs/helpers/_grids.scss
 - stylesheets/singularitygs/helpers/_gridsets.scss
 - stylesheets/singularitygs/helpers/_lists.scss