singularitygs 1.2.0.rc.3 → 1.2.0.rc.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c23e3ffa12bb3c8783bc67c2e79acd890951b4
-  data.tar.gz: 11edba64b464ecbefc234a68710b1540816930fd
+  metadata.gz: d706c056c5556341bea512d9cb6210fa4db3b592
+  data.tar.gz: d08c1570e84c7a0c942f62a95d4d32c64f17c92d
 SHA512:
-  metadata.gz: 0dc401fa4e10888829f3a0d3a6763467ace375ef87a0e01fcd519ff3ce2e6d8b19ab1c2bb96eb94a0e9c95ce1ea68f4f0bcb8b4535e9368f3e0259263944cb1d
-  data.tar.gz: 26522cd21b16a6d48b4f5093e4bf135644e52878ee04e8691ecb4e6e3b883f0f00f97c653367d88b9a313cb72be0b0ed5dcf43462b2098ae7918414c3f3688b2
+  metadata.gz: 7b7c3f9da4cc708a01af3f1fb936323964b1b55506392adca98e81cee554b409e8100ed8e1342f06280a81028234c5e6953175c8d5ed7023e79f694eb6379c67
+  data.tar.gz: 37e53f2d01555c72effd9b59aa14e73d1744adf30593c6be406b762ec71b7e85996b1a672421450b1d3ca5ab666917ff58b5e4d50c811ac9cc25588a5ad47901

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.3"
-  DATE = "2014-01-17"
+  VERSION = "1.2.0.rc.6"
+  DATE = "2014-02-11"
 end

data/stylesheets/_singularitygs.scss

@@ -9,7 +9,10 @@ $Singularity-Settings: (
   'direction': 'ltr',
   'mobile first': true,
   'include border box': false,
-  'include clearfix': false
+  'include clearfix': false,
+  'background grid color': chocolate,
+  'asymmetric output': 'isolation',
+  'debug': false
 );
 
 //////////////////////////////

data/stylesheets/singularitygs/_api.scss

@@ -45,6 +45,10 @@
     'options': $options
   );
 
+  @if sgs-get('debug') != false {
+    -sgs-span-settings: inspect($Span-Map);
+  }
+
 
   @if function-exists('output-#{$output-style}') {
     $Left: ();

data/stylesheets/singularitygs/api/_isolation.scss

@@ -114,3 +114,22 @@
   $Options: if(length($Options) > 0, $Options, null);
   @include grid-span($Span, $Location, $grid, $gutter, 'isolation', $gutter-style, $Options);
 }
+
+//////////////////////////////
+// Happy Syntax of Asymmetric Grids
+//
+// Makes working with asymmetric grids easier!
+//////////////////////////////
+@mixin asymmetric-span($Location, $Span: false, $grid: false, $gutter: false, $gutter-style: false, $from: false, $output-style: false) {
+
+  $Span: if($Span != false, $Span, 1);
+  $output-style: if($output-style != false, $output-style, sgs-get('asymmetric output'));
+
+  $Options: ();
+  @if $from {
+    $Options: map-merge($Options, ('from': $from));
+  }
+  $Options: if(length($Options) > 0, $Options, null);
+
+  @include grid-span($Span, $Location, $grid, $gutter, $output-style, $gutter-style, $Options);
+}

data/stylesheets/singularitygs/helpers/_background-grid.scss

@@ -32,14 +32,6 @@
 //
 // Note: Sub-pixel rounding can lead to several pixels of variation between browsers.
 
-
-// -----------------------------------------------
-
-// -----------------------------------------------
-// Grid Overlay
-$background-grid-color:   Chocolate     !default;
-$show-grid-backgrounds:   true          !default;
-
 // -----------------------------------------------
 // Grid Background
 
@@ -47,10 +39,12 @@ $show-grid-backgrounds:   true          !default;
   $columns: null,
   $gutter: null,
   $gutter-style: null,
-  $color: $background-grid-color
+  $color: null
 ) {
 
-  @if $show-grid-backgrounds {
+  $color: if($color != null, $color, sgs-get('background grid color'));
+
+  @if sgs-get('debug') != false {
     $columns: if($columns != null, $columns, sgs-get('grids'));
     $gutter: if($gutter != null, $gutter, sgs-get('gutters'));
     $gutter-style: if($gutter-style != null, $gutter-style, sgs-get('gutter styles'));

data/stylesheets/singularitygs/helpers/_settings.scss

@@ -68,7 +68,7 @@ $DEPRECATE:singularity-deprecation-warning();
 // Set Settings
 //////////////////////////////
 @function sgs-set($setting, $value) {
-  @if (str-index($setting, '-') > 0 or str-index($setting, '_') > 0) and str-index($setting, ' ') == 0 {
+  @if (str-index($setting, '-') or str-index($setting, '_')) and str-index($setting, ' ') == null {
     @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;

data/stylesheets/singularitygs/math/_columns.scss

@@ -2,7 +2,6 @@
 // Find width, in percentages, of the column span
 //////////////////////////////
 @function column-span($span, $location, $grid: null, $gutter: null, $gutter-style: null) {
-
   // Find the grid and gutters
   $grid: find-grid($grid);
   $gutter: find-gutter($gutter);
@@ -36,8 +35,10 @@
     }
     @else {
       $total: $location + $span - 1;
-      @for $i from $location through $total {
-        $span-and-gutters: $span-and-gutters + nth($grid, $i) + $gutter;
+      @if $total != 0 {
+        @for $i from $location through $total {
+          $span-and-gutters: $span-and-gutters + nth($grid, $i) + $gutter;
+        }
       }
     }
     $span-and-gutters: $span-and-gutters - $gutter;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularitygs
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc.3
+  version: 1.2.0.rc.6
 platform: ruby
 authors:
 - Scott Kellum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -43,16 +43,16 @@ dependencies:
   name: breakpoint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
 description: Advanced responsive grid system for Sass and Compass
 email:
 - scott@scottkellum.com