Merge branch 'release/1.0.10' into develop

README.md

@@ -1,4 +1,4 @@
-Ribs v1.0.9
+Ribs v1.0.10
 =============
 > Ribs is the evolution of Skeleton, the original author seems to have disappeared and/or lost interest in the project, and my colleagues and I use this an awful lot.
 
@@ -50,6 +50,7 @@ Then following that, from the root dir of this project, run `npm install` which
 You should be good to go.
 
 ## Changelog
+* Oct 15, 2013 - (v1.0.10) Resolved some issues with the grid system (Switched to margins for push/pull and removed tablet specific alpha and omega classes), Added a couple of example files.
 * Oct 15, 2013 - (v1.0.9) Default flag added to variables - Thanks to Ivo Bathke (@ivoba)
 * Oct 10, 2013 - (v1.0.8) Initial inline documentation, styledocco based docs generation, fixed breakpoint oversight on media queries for tablet and mobile
 * Oct 10, 2013 - (v1.0.7) Documented the differences between the original skeleton project and Ribs, Updated normalize to 2.1.3

build/css/Ribs.css

@@ -365,27 +365,26 @@ hr {
 #Grid System
 
 <div class="one column alpha">One</div>
-<div class="eleven columns omega">Eleven</div>
-<div class="two columns alpha">Two</div>
-<div class="ten columns omega">Ten</div>
+<div class="fifteen columns omega">Fifteen</div>
 <div class="three columns alpha">Three</div>
+<div class="thirteen columns omega">Thirteen</div>
+<div class="push-by-twelve four columns alpha omega">Four Pushed by Twelve</div>
+<div class="seven columns alpha">Seven</div>
 <div class="nine columns omega">Nine</div>
 <div class="four columns alpha">Four</div>
-<div class="eight columns omega">Eight</div>
+<div class="twelve columns omega">Twelve</div>
 <div class="five columns alpha">Five</div>
-<div class="seven columns omega">Seven</div>
-<div class="six columns alpha">Six</div>
-<div class="six columns omega">Six</div>
-<div class="seven columns alpha">Seven</div>
-<div class="five columns omega">Five</div>
+<div class="eleven columns omega">Eleven</div>
 <div class="eight columns alpha">Eight</div>
-<div class="four  columns omega">Four</div>
-<div class="nine columns alpha">Nine</div>
+<div class="eight columns omega">Eight</div>
+<div class="six columns alpha">Six</div>
+<div class="ten columns omega">Ten</div>
+<div class="push-by-eight eight columns alpha omega">Eight Pushed by Eight</div>
+<div class="three columns alpha">Three</div>
+<div class="ten columns">Ten</div>
 <div class="three columns omega">Three</div>
-<div class="ten columns alpha">Ten</div>
-<div class="two columns omega">Two</div>
 <div class="eleven columns alpha">Eleven</div>
-<div class="one column omega">One</div>
+<div class="five columns omega">Five</div>
 */
 .container {
   position: relative;

component.json

@@ -1,6 +1,6 @@
 {
   "name": "Ribs",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "main": "build/css/Ribs.css",
   "ignore": [
     "**/.*",

package.json

@@ -2,7 +2,7 @@
   "name": "Ribs",
   "title": "Ribs",
   "description": "The evolution of Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "homepage": "https://github.com/nickpack/Ribs",
   "author": {
     "name": "Nick Pack",