singularitygs 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8ed425cf36235e58ab1ee29978fc5b1e97e4beb
-  data.tar.gz: d2755f5438f669c9e5fabb82c90e787d8720be46
+  metadata.gz: abb9b77eb89564812ea18968e3d9845d394843de
+  data.tar.gz: 31191e29db09bf70faa60e326e50ef4894ad4ae6
 SHA512:
-  metadata.gz: e633e19db9e123599842b1101de98e1c516d043a950cdb7017db0f947eb2b09fdb9a747f254365e7cc71fd55fe108214107278a930d4c678ea19af0980c13585
-  data.tar.gz: 1a60264828d8383d777693e23a606fa452e7d2cef1f68ec6f138e60597fcb19d3bd72ffa8fd8725d0c0af734dbced0dd1f121a56777c6b8865007adcb9488822
+  metadata.gz: 89e8cbecaa1780b586c876573d0780a401b7f527559e966c728444247a0df838f32d73eb6ae52d712fee059fc6c45376d344fffa1e5f7d7bf764eaa0033848bb
+  data.tar.gz: b0facd16278b69eb818105f900d4330fa2b561868c68950504db428d1d79e6dfc0dbe5f080b692e621915abdb0e39a01033dc9c3cc0b354b70de9a5c061db6e3

data/lib/singularitygs.rb

@@ -12,6 +12,6 @@ else
 end
 
 module SingularityGS
-  VERSION = "1.3.0"
-  DATE = "2014-08-11"
+  VERSION = "1.4.0"
+  DATE = "2014-08-23"
 end

data/stylesheets/singularitygs/helpers/_layout.scss

@@ -2,6 +2,29 @@
 // Wrapper mixin for overriding the global contexts as a block
 //////////////////////////////
 @mixin layout($grid: false, $gutter: false, $output-style: false, $gutter-style: false) {
+
+  @if type-of($grid) == 'map' {
+    $layout: $grid;
+    @if map-has-key($layout, 'grid') {
+      $grid: map-get($layout, 'grid');
+    }
+
+    @if map-has-key($layout, 'gutter') {
+      $gutter: map-get($layout, 'gutter');
+    }
+
+    @if map-has-key($layout, 'output style') {
+      $output-style: map-get($layout, 'output style');
+    }
+    @if map-has-key($layout, 'output') {
+      $output-style: map-get($layout, 'output');
+    }
+
+    @if map-has-key($layout, 'gutter style') {
+      $gutter-style: map-get($layout, 'gutter style');
+    }
+  }
+
   // Private holder for current global context
   $layout-private-grid-holder: sgs-get('grids');
   $layout-private-gutter-holder: sgs-get('gutters');
@@ -86,6 +109,9 @@
       @if map-has-key($layout, 'output style') {
         $output-style: map-get($layout, 'output style');
       }
+      @if map-has-key($layout, 'output') {
+        $output-style: map-get($layout, 'output');
+      }
 
       @if map-has-key($layout, 'gutter style') {
         $gutter-style: map-get($layout, 'gutter style');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularitygs
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Scott Kellum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass