singularity-extras 0.0.1 → 0.0.2

data/lib/singularity-extras.rb

@@ -6,6 +6,6 @@ require 'sassy-math'
 Compass::Frameworks.register("singularity-extras", :path => "#{File.dirname(__FILE__)}/..")
 
 module SingularityExtras
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   DATE = "2012-04-04"
 end

data/stylesheets/_singularity-extras.scss

@@ -1,3 +1,4 @@
 @import "singularity-extras/helpers";
 @import "singularity-extras/generators";
-@import "singularity-extras/output";
+@import "singularity-extras/output";
+@import "singularity-extras/layouts";

data/stylesheets/singularity-extras/_layouts.scss

@@ -0,0 +1 @@
+@import "layouts/layout";

data/stylesheets/singularity-extras/generators/_compound.scss

@@ -32,7 +32,7 @@
     // add the counter value to the compound grid list, reset counter
     // this marks where one column ends and a new one begins
     @if $add-col {
-      $compound-grid: join($compound-grid, $compound-counter, comma);
+      $compound-grid: join($compound-grid, $compound-counter);
       $compound-counter: 1;
     }
     // if no column is added, bump up counter

data/stylesheets/singularity-extras/generators/_ratio.scss

@@ -6,7 +6,7 @@
 
   @for $i from 0 through $steps - 1 {
     $xr: $x * pow($ratio, $i);
-    $return: append($return, $xr, comma);
+    $return: append($return, $xr);
   }
 
   @if $start == 'small' and $ratio < 1 {

data/stylesheets/singularity-extras/layouts/_layout.scss

@@ -0,0 +1,28 @@
+//////////////////////////////
+// Wrapper mixin for overriding the global contexts as a block
+//////////////////////////////
+@mixin layout($grid: false, $gutter: false, $output-style: false) {
+  // Private holder for current global context
+  $layout-private-grid-holder: $grids;
+  $layout-private-gutter-holder: $gutters;
+  $layout-private-output-holder: $output;
+
+  // Overides current global contexts, but only if needed
+  @if $grid != false {
+    $grids: $grid;
+  }
+  @if $gutter != false {
+    $gutters: $gutter;
+  }
+  @if $output-style != false {
+    $output: $output-style;
+  }
+
+  // All the things!
+  @content;
+
+  // Resets global contexts
+  $grids: $layout-private-grid-holder;
+  $gutters: $layout-private-gutter-holder;
+  $output: $layout-private-output-holder;
+}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Scott Kellum
@@ -74,6 +74,7 @@ files:
 - stylesheets/_singularity-extras.scss
 - stylesheets/singularity-extras/_generators.scss
 - stylesheets/singularity-extras/_helpers.scss
+- stylesheets/singularity-extras/_layouts.scss
 - stylesheets/singularity-extras/_output.scss
 - stylesheets/singularity-extras/generators/_compound.scss
 - stylesheets/singularity-extras/generators/_ratio-spiral.scss
@@ -81,6 +82,7 @@ files:
 - stylesheets/singularity-extras/helpers/_list-sum.scss
 - stylesheets/singularity-extras/helpers/_repeat.scss
 - stylesheets/singularity-extras/helpers/_reverse.scss
+- stylesheets/singularity-extras/layouts/_layout.scss
 has_rdoc: true
 homepage: http://singularity.gs
 licenses: []