singularitygs 1.0.6 → 1.0.7

data/lib/singularitygs.rb

@@ -4,6 +4,6 @@ require 'breakpoint'
 Compass::Frameworks.register("singularitygs", :path => "#{File.dirname(__FILE__)}/..")
 
 module SingularityGS
-  VERSION = "1.0.6"
-  DATE = "2013-06-05"
+  VERSION = "1.0.7"
+  DATE = "2013-04-10"
 end

data/stylesheets/singularitygs/_api.scss

@@ -1,4 +1,4 @@
-@mixin grid-span($span, $location, $grid: false, $gutter: false, $output-style: $output, $options: false) {
+@mixin grid-span($span, $location: 1, $grid: false, $gutter: false, $output-style: $output, $options: false) {
 
   @if $output-style == 'float' {
     @include output-float($span, $location, $grid, $gutter, $options);

data/stylesheets/singularitygs/_helpers.scss

@@ -12,4 +12,9 @@
 //////////////////////////////
 // UI Helpers
 //////////////////////////////
-@import "helpers/background-grid";
+@import "helpers/background-grid";
+
+//////////////////////////////
+// Layout Helpers
+//////////////////////////////
+@import "helpers/layout";

data/stylesheets/singularitygs/api/_float.scss

@@ -114,9 +114,14 @@
   $gutter: find-gutter($gutter);
   $row: false;
 
+  // Working around SASS treating a number like a list with one element
+  @if type-of($grid) == 'list' and length($grid) == 1 {
+    $grid: nth($grid, 1);
+  }
+
   @if type-of($grid) == 'number' and length($grid) == 1 {
     @if $location == 'last' or $location == 'omega' {
-      $location: length($grid) - $span + 1;
+      $location: $grid - $span + 1;
     }
     @else {
       @if $location == 'first' or $location == 'alpha' {
@@ -137,4 +142,4 @@
   @else {
     @warn 'Asymmetric Grids need a Location value as well as a span value in order to know where on the grid you are! Please include a location value!';
   }
-}
+}

data/stylesheets/singularitygs/helpers/_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

@@ -1,73 +1,76 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: singularitygs
-version: !ruby/object:Gem::Version
-  version: 1.0.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 7
+  version: 1.0.7
 platform: ruby
-authors:
+authors: 
 - Scott Kellum
 - Sam Richard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-10 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 2
+        - 1
         version: 3.2.1
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.2
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: compass
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 2
         version: 0.12.2
-- !ruby/object:Gem::Dependency
-  name: breakpoint
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: breakpoint
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 1
         version: 2.0.1
+  type: :runtime
+  version_requirements: *id003
 description: Advanced responsive grid system for Sass and Compass
-email:
+email: 
 - scott@scottkellum.com
 - snugug@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/singularitygs.rb
 - stylesheets/_singularitygs.scss
 - stylesheets/singularitygs/_api.scss
@@ -88,6 +91,7 @@ files:
 - stylesheets/singularitygs/helpers/_columns.scss
 - stylesheets/singularitygs/helpers/_directions.scss
 - stylesheets/singularitygs/helpers/_find.scss
+- stylesheets/singularitygs/helpers/_layout.scss
 - stylesheets/singularitygs/helpers/_sass-lists.scss
 - stylesheets/singularitygs/helpers/_span-shared.scss
 - stylesheets/singularitygs/language/_parse-add.scss
@@ -110,31 +114,36 @@ files:
 - templates/project/manifest.rb
 - templates/project/partials/_base.scss
 - templates/project/style.scss
+has_rdoc: true
 homepage: http://singularity.gs
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '1.2'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
+      version: "1.2"
 requirements: []
+
 rubyforge_project: singularitygs
-rubygems_version: 1.8.25
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Singularity is a fluid grid system that can generate uniform columns as well
-  as asymmetric and compound grids. It is designed to be extensable, adding additional
-  outputs or grid generators are easy, and the core syntax is simple to build upon
-  for custom input syntaxes.
+summary: Singularity is a fluid grid system that can generate uniform columns as well as asymmetric and compound grids. It is designed to be extensable, adding additional outputs or grid generators are easy, and the core syntax is simple to build upon for custom input syntaxes.
 test_files: []
+