css_grid 2.7.7 → 2.7.8

data/README.md

@@ -35,12 +35,13 @@ app/assets/stylesheets/application.css
 
 #### Rails <= 3.0
 
-Add the following lines to your rakefile then run 'rake css:grid:setup' to copy 'grid.scss' to public/stylesheets
+Add the following lines to your rakefile then run 'rake css:grid:setup' to copy 'grid.css' to public/stylesheets
 ```
 	require 'css_grid'
 	require 'css_grid/tasks'
 ```
 
+Then include the grid.css file in your layout
 
 ### Grid Helpers
 
@@ -287,7 +288,7 @@ It will create an grid structure using four_spans (three columns on a twelve gri
 ```
 
 Screenshot
-![css_grid normal](https://raw.github.com/petrachi/css_grid/master/lib/assets/images/readme/normal.png)
+![css_grid normal](https://raw.github.com/petrachi/css_grid/master/ressources/readme/normal.png)
 
 
 If you'r more comfortable by telling width of spans istead of the nurmber of columns to use, you can use *_span_container the exact same way than *_col_container. To create the same output as previously, call :
@@ -393,7 +394,7 @@ Examples :
 	</section>
 ```
 
-![css_grid nested](https://raw.github.com/petrachi/css_grid/master/lib/assets/images/readme/nested.png)
+![css_grid nested](https://raw.github.com/petrachi/css_grid/master/ressources/readme/nested.png)
 
 --
 
@@ -425,7 +426,7 @@ Examples :
 	</section>
 ```
 
-![css_grid disable](https://raw.github.com/petrachi/css_grid/master/lib/assets/images/readme/disable.png)
+![css_grid disable](https://raw.github.com/petrachi/css_grid/master/ressources/readme/disable.png)
 
 --
 
@@ -456,7 +457,7 @@ Examples :
 	</section>
 ```
 
-![css_grid prepend](https://raw.github.com/petrachi/css_grid/master/lib/assets/images/readme/prepend.png)
+![css_grid prepend](https://raw.github.com/petrachi/css_grid/master/ressources/readme/prepend.png)
 
 --
 
@@ -518,7 +519,7 @@ Examples :
 	</section>
 ```
 
-![css_grid menu](https://raw.github.com/petrachi/css_grid/master/lib/assets/images/readme/menu.png)
+![css_grid menu](https://raw.github.com/petrachi/css_grid/master/ressources/readme/menu.png)
 
 --
 
@@ -539,7 +540,7 @@ Examples :
 	</section>
 ```
 
-![css_grid one_col_row](https://raw.github.com/petrachi/css_grid/master/lib/assets/images/readme/one_col_row.png)
+![css_grid one_col_row](https://raw.github.com/petrachi/css_grid/master/ressources/readme/one_col_row.png)
 
 --
 
@@ -629,7 +630,7 @@ Examples :
 	</section>
 ```
 
-![css_grid multi_nested](https://raw.github.com/petrachi/css_grid/master/lib/assets/images/readme/multi_nested.png)
+![css_grid multi_nested](https://raw.github.com/petrachi/css_grid/master/ressources/readme/multi_nested.png)
 
 --
 

data/lib/css_grid/tasks.rb

@@ -5,9 +5,9 @@ namespace "css:grid" do
       "app/assets/stylesheets/"
     else
       "public/stylesheets"
-    end, "grid.scss")
+    end, "grid.css")
     
     # Copy stylesheet file to <tt>public/stylesheets/grid.scss</tt>.
-    FileUtils.cp(File.dirname(__FILE__) + "/../assets/stylesheets/grid.scss", stylesheet_file) unless Rails.version >= "3.1"
+    FileUtils.cp(File.dirname(__FILE__) + "/../../ressources/grid.css", stylesheet_file) unless Rails.version >= "3.1"
   end
 end

data/lib/css_grid/version.rb

@@ -1,3 +1,3 @@
 module CssGrid
-  VERSION = "2.7.7"
+  VERSION = "2.7.8"
 end

data/lib/css_grid.rb

@@ -42,7 +42,7 @@ module GridHelper
     
     warn "WARNING : argument ':nested' is not supported for '#{ tag }'" if options[:nested].present? and tag != :row
     
-    if tag =~ /(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve)_span$/
+    if tag.to_s =~ /(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve)_span$/
       @nested_stack << $1
         
       unstack = true
@@ -59,7 +59,7 @@ module GridHelper
                                  
     safe_buffer = content_tag(options.delete(:element) || GRID_CONFIG[:elements][tag], options, &block)
     
-    @nested_stack.pop if unstack
+    @nested_stack.pop if unstack    
     safe_buffer
   end
 
@@ -111,7 +111,7 @@ module GridHelper
     
     safe_buffer = rows.reduce(:safe_concat)
     safe_buffer = grid(:container, options.except!(:spans, :rows)){ safe_buffer } unless disable.delete :container
-    safe_buffer
+    Rails.version < "3" ? concat(safe_buffer) : safe_buffer
   end
   
   def spans_container span_width, options = {}, &block

data/ressources/grid.css

@@ -0,0 +1,431 @@
+
+/* Screens 1151px to Infinite */
+@media all {
+  .container .row {
+    width: 1152px;
+    margin: 0 auto;
+    display: table;
+    /* 55px */
+    /* 150px */
+    /* 245px */
+    /* 340px */
+    /* 530px */ }
+    .container .row.nested {
+      margin: 0 -12.0px;
+      min-width: 0;
+      width: auto; }
+    .container .row .one_span {
+      width: 72.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .two_span {
+      width: 168.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .three_span {
+      width: 264.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .four_span {
+      width: 360.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .five_span {
+      width: 456.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .six_span {
+      width: 552.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .seven_span {
+      width: 648.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .eight_span {
+      width: 744.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .nine_span {
+      width: 840.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .ten_span {
+      width: 936.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .eleven_span {
+      width: 1032.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .twelve_span {
+      width: 1128.0px;
+      margin: 0 12.0px;
+      float: left; }
+    .container .row .prepend_one {
+      margin-left: 108.0px; }
+    .container .row .prepend_two {
+      margin-left: 204.0px; }
+    .container .row .prepend_three {
+      margin-left: 300.0px; }
+    .container .row .prepend_four {
+      margin-left: 396.0px; }
+    .container .row .prepend_five {
+      margin-left: 492.0px; }
+    .container .row .prepend_six {
+      margin-left: 588.0px; }
+    .container .row .prepend_seven {
+      margin-left: 684.0px; }
+    .container .row .prepend_eight {
+      margin-left: 780.0px; }
+    .container .row .prepend_nine {
+      margin-left: 876.0px; }
+    .container .row .prepend_ten {
+      margin-left: 972.0px; }
+    .container .row .prepend_eleven {
+      margin-left: 1068.0px; }
+    .container .row .prepend_twelve {
+      margin-left: 1164.0px; }
+    .container .row .minus_one {
+      margin-left: -84.0px; }
+    .container .row .minus_two {
+      margin-left: -180.0px; }
+    .container .row .minus_three {
+      margin-left: -276.0px; }
+    .container .row .minus_four {
+      margin-left: -372.0px; }
+    .container .row .minus_five {
+      margin-left: -468.0px; }
+    .container .row .minus_six {
+      margin-left: -564.0px; }
+    .container .row .minus_seven {
+      margin-left: -660.0px; }
+    .container .row .minus_eight {
+      margin-left: -756.0px; }
+    .container .row .minus_nine {
+      margin-left: -852.0px; }
+    .container .row .minus_ten {
+      margin-left: -948.0px; }
+    .container .row .minus_eleven {
+      margin-left: -1044.0px; }
+    .container .row .minus_twelve {
+      margin-left: -1140.0px; }
+    .container .row .append_one {
+      margin-right: 108.0px; }
+    .container .row .append_two {
+      margin-right: 204.0px; }
+    .container .row .append_three {
+      margin-right: 300.0px; }
+    .container .row .append_four {
+      margin-right: 396.0px; }
+    .container .row .append_five {
+      margin-right: 492.0px; }
+    .container .row .append_six {
+      margin-right: 588.0px; }
+    .container .row .append_seven {
+      margin-right: 684.0px; }
+    .container .row .append_eight {
+      margin-right: 780.0px; }
+    .container .row .append_nine {
+      margin-right: 876.0px; }
+    .container .row .append_ten {
+      margin-right: 972.0px; }
+    .container .row .append_eleven {
+      margin-right: 1068.0px; }
+    .container .row .append_twelve {
+      margin-right: 1164.0px; }
+
+  .container img, .container object, .container embed {
+    max-width: 100%; }
+  .container img {
+    height: auto; } }
+/* Screens 960px to 1151px */
+@media only screen and (max-width: 1151px) {
+  .container .row {
+    width: 960px;
+    margin: 0 auto;
+    display: table;
+    /* 55px */
+    /* 150px */
+    /* 245px */
+    /* 340px */
+    /* 530px */ }
+    .container .row.nested {
+      margin: 0 -10.0px;
+      min-width: 0;
+      width: auto; }
+    .container .row .one_span {
+      width: 60.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .two_span {
+      width: 140.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .three_span {
+      width: 220.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .four_span {
+      width: 300.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .five_span {
+      width: 380.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .six_span {
+      width: 460.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .seven_span {
+      width: 540.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .eight_span {
+      width: 620.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .nine_span {
+      width: 700.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .ten_span {
+      width: 780.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .eleven_span {
+      width: 860.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .twelve_span {
+      width: 940.0px;
+      margin: 0 10.0px;
+      float: left; }
+    .container .row .prepend_one {
+      margin-left: 90.0px; }
+    .container .row .prepend_two {
+      margin-left: 170.0px; }
+    .container .row .prepend_three {
+      margin-left: 250.0px; }
+    .container .row .prepend_four {
+      margin-left: 330.0px; }
+    .container .row .prepend_five {
+      margin-left: 410.0px; }
+    .container .row .prepend_six {
+      margin-left: 490.0px; }
+    .container .row .prepend_seven {
+      margin-left: 570.0px; }
+    .container .row .prepend_eight {
+      margin-left: 650.0px; }
+    .container .row .prepend_nine {
+      margin-left: 730.0px; }
+    .container .row .prepend_ten {
+      margin-left: 810.0px; }
+    .container .row .prepend_eleven {
+      margin-left: 890.0px; }
+    .container .row .prepend_twelve {
+      margin-left: 970.0px; }
+    .container .row .minus_one {
+      margin-left: -70.0px; }
+    .container .row .minus_two {
+      margin-left: -150.0px; }
+    .container .row .minus_three {
+      margin-left: -230.0px; }
+    .container .row .minus_four {
+      margin-left: -310.0px; }
+    .container .row .minus_five {
+      margin-left: -390.0px; }
+    .container .row .minus_six {
+      margin-left: -470.0px; }
+    .container .row .minus_seven {
+      margin-left: -550.0px; }
+    .container .row .minus_eight {
+      margin-left: -630.0px; }
+    .container .row .minus_nine {
+      margin-left: -710.0px; }
+    .container .row .minus_ten {
+      margin-left: -790.0px; }
+    .container .row .minus_eleven {
+      margin-left: -870.0px; }
+    .container .row .minus_twelve {
+      margin-left: -950.0px; }
+    .container .row .append_one {
+      margin-right: 90.0px; }
+    .container .row .append_two {
+      margin-right: 170.0px; }
+    .container .row .append_three {
+      margin-right: 250.0px; }
+    .container .row .append_four {
+      margin-right: 330.0px; }
+    .container .row .append_five {
+      margin-right: 410.0px; }
+    .container .row .append_six {
+      margin-right: 490.0px; }
+    .container .row .append_seven {
+      margin-right: 570.0px; }
+    .container .row .append_eight {
+      margin-right: 650.0px; }
+    .container .row .append_nine {
+      margin-right: 730.0px; }
+    .container .row .append_ten {
+      margin-right: 810.0px; }
+    .container .row .append_eleven {
+      margin-right: 890.0px; }
+    .container .row .append_twelve {
+      margin-right: 970.0px; } }
+/* Screens 768px to 959px */
+@media only screen and (max-width: 959px) {
+  body {
+    font-size: 0.8em;
+    line-height: 1.5em; }
+
+  .container .row {
+    width: 768px;
+    margin: 0 auto;
+    display: table;
+    /* 55px */
+    /* 150px */
+    /* 245px */
+    /* 340px */
+    /* 530px */ }
+    .container .row.nested {
+      margin: 0 -8.0px;
+      min-width: 0;
+      width: auto; }
+    .container .row .one_span {
+      width: 48.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .two_span {
+      width: 112.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .three_span {
+      width: 176.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .four_span {
+      width: 240.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .five_span {
+      width: 304.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .six_span {
+      width: 368.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .seven_span {
+      width: 432.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .eight_span {
+      width: 496.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .nine_span {
+      width: 560.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .ten_span {
+      width: 624.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .eleven_span {
+      width: 688.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .twelve_span {
+      width: 752.0px;
+      margin: 0 8.0px;
+      float: left; }
+    .container .row .prepend_one {
+      margin-left: 72.0px; }
+    .container .row .prepend_two {
+      margin-left: 136.0px; }
+    .container .row .prepend_three {
+      margin-left: 200.0px; }
+    .container .row .prepend_four {
+      margin-left: 264.0px; }
+    .container .row .prepend_five {
+      margin-left: 328.0px; }
+    .container .row .prepend_six {
+      margin-left: 392.0px; }
+    .container .row .prepend_seven {
+      margin-left: 456.0px; }
+    .container .row .prepend_eight {
+      margin-left: 520.0px; }
+    .container .row .prepend_nine {
+      margin-left: 584.0px; }
+    .container .row .prepend_ten {
+      margin-left: 648.0px; }
+    .container .row .prepend_eleven {
+      margin-left: 712.0px; }
+    .container .row .prepend_twelve {
+      margin-left: 776.0px; }
+    .container .row .minus_one {
+      margin-left: -56.0px; }
+    .container .row .minus_two {
+      margin-left: -120.0px; }
+    .container .row .minus_three {
+      margin-left: -184.0px; }
+    .container .row .minus_four {
+      margin-left: -248.0px; }
+    .container .row .minus_five {
+      margin-left: -312.0px; }
+    .container .row .minus_six {
+      margin-left: -376.0px; }
+    .container .row .minus_seven {
+      margin-left: -440.0px; }
+    .container .row .minus_eight {
+      margin-left: -504.0px; }
+    .container .row .minus_nine {
+      margin-left: -568.0px; }
+    .container .row .minus_ten {
+      margin-left: -632.0px; }
+    .container .row .minus_eleven {
+      margin-left: -696.0px; }
+    .container .row .minus_twelve {
+      margin-left: -760.0px; }
+    .container .row .append_one {
+      margin-right: 72.0px; }
+    .container .row .append_two {
+      margin-right: 136.0px; }
+    .container .row .append_three {
+      margin-right: 200.0px; }
+    .container .row .append_four {
+      margin-right: 264.0px; }
+    .container .row .append_five {
+      margin-right: 328.0px; }
+    .container .row .append_six {
+      margin-right: 392.0px; }
+    .container .row .append_seven {
+      margin-right: 456.0px; }
+    .container .row .append_eight {
+      margin-right: 520.0px; }
+    .container .row .append_nine {
+      margin-right: 584.0px; }
+    .container .row .append_ten {
+      margin-right: 648.0px; }
+    .container .row .append_eleven {
+      margin-right: 712.0px; }
+    .container .row .append_twelve {
+      margin-right: 776.0px; } }
+/* Mobile 0 to 767px */
+@media handheld, only screen and (max-width: 767px) {
+  body {
+    font-size: 16px;
+    -webkit-text-size-adjust: none; }
+
+  .container .row {
+    width: 100%;
+    padding: 0; }
+    .container .row.nested {
+      margin: 0 -20px; }
+    .container .row .one_span, .container .row .two_span, .container .row .three_span, .container .row .four_span, .container .row .five_span, .container .row .six_span, .container .row .seven_span, .container .row .eight_span, .container .row .nine_span, .container .row .ten_span, .container .row .eleven_span, .container .row .twelve_span {
+      width: auto;
+      float: none;
+      margin: 0;
+      padding: 0 20px; } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_grid
 version: !ruby/object:Gem::Version
-  version: 2.7.7
+  version: 2.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -60,21 +60,22 @@ files:
 - css_grid.gemspec
 - lib/.DS_Store
 - lib/assets/.DS_Store
-- lib/assets/images/.DS_Store
-- lib/assets/images/readme/.DS_Store
-- lib/assets/images/readme/disable.png
-- lib/assets/images/readme/menu.png
-- lib/assets/images/readme/multi_nested.png
-- lib/assets/images/readme/nested.png
-- lib/assets/images/readme/normal.png
-- lib/assets/images/readme/one_col_row.png
-- lib/assets/images/readme/prepend.png
 - lib/assets/stylesheets/.DS_Store
 - lib/assets/stylesheets/grid.scss
 - lib/css_grid.rb
 - lib/css_grid/engine.rb
 - lib/css_grid/tasks.rb
 - lib/css_grid/version.rb
+- ressources/.DS_Store
+- ressources/grid.css
+- ressources/readme/.DS_Store
+- ressources/readme/disable.png
+- ressources/readme/menu.png
+- ressources/readme/multi_nested.png
+- ressources/readme/nested.png
+- ressources/readme/normal.png
+- ressources/readme/one_col_row.png
+- ressources/readme/prepend.png
 homepage: https://github.com/petrachi/css_grid
 licenses: []
 post_install_message: