singularitygs 1.2.0.rc.1 → 1.2.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77de76920fd546a70587ae4aa397b9e4592a331d
-  data.tar.gz: 267fa655d9d5556402e516b5195ae54450943a83
+  metadata.gz: 00c23e3ffa12bb3c8783bc67c2e79acd890951b4
+  data.tar.gz: 11edba64b464ecbefc234a68710b1540816930fd
 SHA512:
-  metadata.gz: 6dca4e176cba9e91ad1b01a4ccd7195a9338bbcc87efdedcc90bb106219e92d5b30beb58a79d555e0a2ce4eb10897f7003e1a1a3d72f559608ece8101cb74d8e
-  data.tar.gz: 14f8bee9514d0277946e55ef883f7fa8e0b28d4992678ee2cfda8cb459555cbaadc58019f0e2000a1ea4c1a779d4c1b6cb375144bbdc78b0876e35cf52a1287e
+  metadata.gz: 0dc401fa4e10888829f3a0d3a6763467ace375ef87a0e01fcd519ff3ce2e6d8b19ab1c2bb96eb94a0e9c95ce1ea68f4f0bcb8b4535e9368f3e0259263944cb1d
+  data.tar.gz: 26522cd21b16a6d48b4f5093e4bf135644e52878ee04e8691ecb4e6e3b883f0f00f97c653367d88b9a313cb72be0b0ed5dcf43462b2098ae7918414c3f3688b2

data/lib/singularitygs.rb

@@ -4,6 +4,6 @@ require 'breakpoint'
 Compass::Frameworks.register("singularitygs", :path => "#{File.dirname(__FILE__)}/..")
 
 module SingularityGS
-  VERSION = "1.2.0.rc.1"
-  DATE = "2014-01-12"
+  VERSION = "1.2.0.rc.3"
+  DATE = "2014-01-17"
 end

data/stylesheets/singularitygs/_api.scss

@@ -71,29 +71,43 @@
     }
 
     // Always try and print the Left value
-    @each $property, $value in $Left {
-      #{$property}: $value;
-    }
+    @include grid-span-build-exclude($Left, $Exclude, false);
 
     // If Direction is Both or RTL, add the RTL attribute selector
     @if $Direction == 'both' or $Direction == 'rtl' {
       [dir="rtl"] & {
-        @each $property, $value in $Right {
-          @if not index($Exclude, $property) {
-            #{$property}: $value;
-          }
-        }
+        @include grid-span-build-exclude($Right, $Exclude, true);
       }
     }
     @else {
-      @each $property, $value in $Right {
-        @if not index($Exclude, $property) {
-          #{$property}: $value;
-        }
-      }
+      @include grid-span-build-exclude($Right, $Exclude, true);
     }
   }
   @else {
     @warn "There doesn't appear to be an output style named `#{$output-style}`. Please ensure that the function `output-#{$output-style}` and that the output style `#{$output-style}` are both available before trying to use them.";
   }
+}
+
+@mixin grid-span-build($property, $value) {
+  @if type-of($value) != 'map' {
+    #{$property}: $value;
+  }
+  @else {
+    @each $prefix, $val in $value {
+      #{$property}: $val;
+    }
+  }
+}
+
+@mixin grid-span-build-exclude($properties, $delta, $exclude: false) {
+  @each $property, $value in $properties {
+    @if $exclude {
+      @if not index($delta, $property) {
+        @include grid-span-build($property, $value);
+      }
+    }
+    @else {
+      @include grid-span-build($property, $value);
+    }
+  }
 }

data/stylesheets/singularitygs/helpers/_settings.scss

@@ -68,8 +68,8 @@ $DEPRECATE:singularity-deprecation-warning();
 // Set Settings
 //////////////////////////////
 @function sgs-set($setting, $value) {
-  @if str-index($setting, '-') > 0 {
-    @warn "Singularity settings should contain spaces, not dashes. Please replace dashes with spaces. Settings will not work as expected until changed.";
+  @if (str-index($setting, '-') > 0 or str-index($setting, '_') > 0) and str-index($setting, ' ') == 0 {
+    @warn "Words in Singularity settings should be spaces, not dashes or underscores. Please replace dashes and underscores between words with spaces. Settings will not work as expected until changed.";
   }
   $singularity: map-merge($singularity, ($setting: $value)) !global;
   @return true;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularitygs
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc.1
+  version: 1.2.0.rc.3
 platform: ruby
 authors:
 - Scott Kellum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass