singularitygs 1.0.4 → 1.0.5

data/lib/singularitygs.rb

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

data/stylesheets/singularitygs/api/_float.scss

@@ -30,16 +30,16 @@
 
     @if $end-row {
       float: $opp;
+      margin-#{$opp}: 0%;
     }
     @else {
       float: $dir;
 
       @if $start-row {
         margin-#{$dir}: 0%;
+
       }
-      @else {
-        margin-#{$opp}: gutter-span($gutter, $columns);
-      }
+      margin-#{$opp}: gutter-span($gutter, $columns);
     }
   }
 
@@ -56,6 +56,7 @@
 
       @if $end-row {
         float: $opp;
+        margin-#{$opp}: 0%;
       }
       @else {
         float: $dir;
@@ -63,11 +64,6 @@
         @if $start-row {
           margin-#{$dir}: 0%;
         }
-        @else {
-          margin-#{$opp}: gutter-span($gutter, $columns);
-        }
-
-        margin-#{$dir}: 0;
         margin-#{$opp}: gutter-span($gutter, $columns);
       }
     }

data/stylesheets/singularitygs/grids/_add.scss

@@ -1,10 +1,29 @@
-@function add-grid($grid-definition) {
-  $parsed: parse-add($grid-definition);
-
-  @if nth($parsed, 2) == false and length($grids) == 0 {
-    @return nth($parsed, 1);
+// Accepts a grid definition in the human-readable format. Converts it to the internal format,
+// appends it to a list of grids and returns the resulting list.
+//
+// Note that this function only returns a new list, it does not modify the source list.
+//
+// add-grid($grid-definition, $append-to-list)
+// - $grid-definition : <definition>  See documentation for syntax:
+//                                    https://github.com/Team-Sass/Singularity/wiki/Creating-Grids
+// - $append-to-list  : [list]        A list to append to.
+//                                    Defaults to $grids if none is specified.
+@function add-grid($grid-definition, $append-to-list: $grids) {
+  $parsed:      parse-add($grid-definition); // Converts the definiton to a temporary format:
+                                             // either `((<grid>))` or `((<grid>) (<breakpoint>))`
+  $grid:        nth($parsed, 1); // E. g. `(<grid>)`.
+  $breakpoint:  nth($parsed, 2); // Either `(<breakpoint>)` or false.
+  $list-length: length($append-to-list);
+  
+  // Check whether the definition will be the first one in the list
+  // and whether it has no breakpoint specified.
+  @if $breakpoint == false and $list-length == 0 {
+    // Returns the first item of the list, e. g. `(<grid>)`
+    @return $grid;
   }
   @else {
-    @return append($grids, (nth($parsed, 1) nth($parsed, 2)), 'comma');
+    // Appends to a comma-separated list of definitions in the internal format
+    // and returns it, e. g. `(<grid>), (<grid> <breakpoint>), (<grid> <breakpoint>)`
+    @return append($append-to-list, ($grid $breakpoint), 'comma');
   }
-}
+}

data/stylesheets/singularitygs/gutters/_add.scss

@@ -1,10 +1,29 @@
-@function add-gutter($gutter-definition) {
-  $parsed: parse-add($gutter-definition);
+// Accepts a gutter definition in the human-readable format. Converts it to the internal format,
+// appends it to a list of gutter and returns the resulting list.
+//
+// Note that this function only returns a new list, it does not modify the source list.
+//
+// add-gutter($grid-definition, $append-to-list)
+// - $gutter-definition : <definition>  See documentation for syntax:
+//                                      https://github.com/Team-Sass/Singularity/wiki/Creating-Grids
+// - $append-to-list    : [list]        A list to append to.
+//                                      Defaults to $gutters if none is specified.
+@function add-gutter($gutter-definition, $append-to-list: $gutters) {
+  $parsed: parse-add($gutter-definition); // Converts the definiton to a temporary format:
+                                          // either `((<gutter>))` or `((<gutter>) (<breakpoint>))`
+  $gutter:      nth($parsed, 1); // E. g. `(<gutter>)`.
+  $breakpoint:  nth($parsed, 2); // Either `(<breakpoint>)` or false.
+  $list-length: length($append-to-list);
 
-  @if nth($parsed, 2) == false and length($gutters) == 0 {
-    @return nth($parsed, 1);
+  // Check whether the definition will be the first one in the list
+  // and whether it has no breakpoint specified.
+  @if $breakpoint == false and $list-length == 0 {
+    // Returns the first item of the list, e. g. `(<gutter>)`
+    @return $gutter;
   }
   @else {
-    @return append($gutters, (nth($parsed, 1) nth($parsed, 2)), 'comma');
+    // Appends to a comma-separated list of definitions in the internal format
+    // and returns it, e. g. `(<gutter>), (<gutter> <breakpoint>), (<gutter> <breakpoint>)`
+    @return append($append-to-list, ($gutter $breakpoint), 'comma');
   }
-}
+}

data/stylesheets/singularitygs/gutters/_find.scss

@@ -13,5 +13,5 @@
     $user-gutter: .25;
   }
 
-  @return find-object($gutters, $user-gutter);
+  @return nth(find-object($gutters, $user-gutter), 1);
 }

data/stylesheets/singularitygs/helpers/_find.scss

@@ -38,35 +38,40 @@
           $context: $query-max;
         }
 
-
-        // If it's smallest than the smallest MQ, use the 1st grid
-        @if $context < $smallest {
-          @return nth($haystack, 1);
-        }
-        // If it's larger than or equal to the largest MQ, use the last grid
-        @else if $context >= $largest {
-          @return nth(nth($reverse-haystack, 1), 1);
-        }
-        // If it's in between the smallest and largest, go run a check.
-        @else {
-          // Loop through each MQ.
-          @for $j from 1 through $rg-length {
-            $query: nth(nth($reverse-haystack, $j), 2);
-
-            // If the MQ is greather than or equal to the the MQ in question, use it! (mobile first)
-            @if ($mobile-first) {
-              @if $context >= $query {
-                @return nth(nth($reverse-haystack, $j), 1);
-              }
+        // Loop over each item in Context to find if any of the items pass.
+        @each $query-context in $context {
+          @if $query-context != false {
+            // If it's smallest than the smallest MQ, use the 1st grid
+            @if $query-context < $smallest {
+              @return nth($haystack, 1);
+            }
+            // If it's larger than or equal to the largest MQ, use the last grid
+            @else if $query-context >= $largest {
+              @return nth(nth($reverse-haystack, 1), 1);
             }
-            // If the MQ is less than or equal to the the MQ in question, use it! (not mobile first)
+            // If it's in between the smallest and largest, go run a check.
             @else {
-              @if $context <= $query {
-                @return nth(nth($reverse-haystack, $j), 1);
+              // Loop through each MQ.
+              @for $j from 1 through $rg-length {
+                $query: nth(nth($reverse-haystack, $j), 2);
+
+                // If the MQ is greather than or equal to the the MQ in question, use it! (mobile first)
+                @if ($mobile-first) {
+                  @if $query-context >= $query {
+                    @return nth(nth($reverse-haystack, $j), 1);
+                  }
+                }
+                // If the MQ is less than or equal to the the MQ in question, use it! (not mobile first)
+                @else {
+                  @if $query-context <= $query {
+                    @return nth(nth($reverse-haystack, $j), 1);
+                  }
+                }
               }
             }
           }
         }
+        @return nth($haystack, 1);
       }
       // All else fails, return the first grid
       @else {

data/templates/demos/{float.html → float.html.erb}

@@ -1,7 +1,8 @@
+<% project_name = File.basename(Compass.configuration.project_path) %><% project_js = Compass.configuration.javascripts_dir %><% project_css = Compass.configuration.css_dir %>
 <html>
   <head>
     <title>Singularity HTML Demo</title>
-    <link rel="stylesheet" href="stylesheets/demo-float.css">
+    <link rel="stylesheet" href="<%= project_css %>/demo-float.css">
   </head>
   <body>
     <div id="page">

data/templates/demos/{isolation.html → isolation.html.erb}

@@ -1,7 +1,8 @@
+<% project_name = File.basename(Compass.configuration.project_path) %><% project_js = Compass.configuration.javascripts_dir %><% project_css = Compass.configuration.css_dir %>
 <html>
   <head>
     <title>Singularity HTML Demo</title>
-    <link rel="stylesheet" href="stylesheets/demo-isolation.css">
+    <link rel="stylesheet" href="<%= project_css %>/demo-isolation.css">
   </head>
   <body>
     <div id="page">

data/templates/demos/manifest.rb

@@ -1,8 +1,8 @@
 description "Singularity Demos"
 
 discover :stylesheets
-file 'isolation.html', :to => 'isolation.html'
-file 'float.html', :to => 'float.html'
+file 'isolation.html.erb', :to => 'isolation.html', :erb => true
+file 'float.html.erb', :to => 'float.html', :erb => true
 
 help %Q{
   For help with Singularity, please ask a question on Stack Overflow (http://stackoverflow.com/questions/ask) tagged with "singularitygs".

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Scott Kellum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-03 00:00:00 -04:00
+date: 2013-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,10 +54,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
+        - 0
         - 1
-        - 1
-        - 1
-        version: 1.1.1
+        version: 2.0.1
   type: :runtime
   version_requirements: *id003
 description: Advanced responsive grid system for Sass and Compass
@@ -105,8 +105,8 @@ files:
 - templates/box-sizing/manifest.rb
 - templates/demos/demo-float.scss
 - templates/demos/demo-isolation.scss
-- templates/demos/float.html
-- templates/demos/isolation.html
+- templates/demos/float.html.erb
+- templates/demos/isolation.html.erb
 - templates/demos/manifest.rb
 - templates/project/grid.js
 - templates/project/grid.min.js