Merge branch 'release/1.0.6' into develop
This commit is contained in:
		@@ -17,6 +17,7 @@ bower install --save ribs
 | 
				
			|||||||
## Build status
 | 
					## Build status
 | 
				
			||||||
The project is set up to build and run csslint on Travis:
 | 
					The project is set up to build and run csslint on Travis:
 | 
				
			||||||
Master: [](https://travis-ci.org/nickpack/Ribs)
 | 
					Master: [](https://travis-ci.org/nickpack/Ribs)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Development: [](https://travis-ci.org/nickpack/Ribs)
 | 
					Development: [](https://travis-ci.org/nickpack/Ribs)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Building
 | 
					## Building
 | 
				
			||||||
@@ -35,6 +36,7 @@ Then following that, from the root dir of this project, run `npm install` which
 | 
				
			|||||||
You should be good to go.
 | 
					You should be good to go.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Changelog
 | 
					## Changelog
 | 
				
			||||||
 | 
					* August 7, 2013 - (v1.0.6) Some additional variables, grid push and pull
 | 
				
			||||||
* July 17, 2013 - (v1.0.5) Some additional variables, some base table styling
 | 
					* July 17, 2013 - (v1.0.5) Some additional variables, some base table styling
 | 
				
			||||||
* July 14, 2013 - (v1.0.4) Removed reset and replaced it with normalize
 | 
					* July 14, 2013 - (v1.0.4) Removed reset and replaced it with normalize
 | 
				
			||||||
* May 30, 2013 - (v1.0.3) Added 1.5 * font size line heights to headings and paragraphs
 | 
					* May 30, 2013 - (v1.0.3) Added 1.5 * font size line heights to headings and paragraphs
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,7 @@
 | 
				
			|||||||
*
 | 
					*
 | 
				
			||||||
* Ribs is the evolution of Skeleton by Nick Pack
 | 
					* Ribs is the evolution of Skeleton by Nick Pack
 | 
				
			||||||
* Free to use under the MIT license.
 | 
					* Free to use under the MIT license.
 | 
				
			||||||
* http://www.opensource.org/licenses/mit-license.php
 | 
					* http://github.com/nickpack/Ribs
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
/* normalize.css v2.1.2 | MIT License | git.io/normalize */
 | 
					/* normalize.css v2.1.2 | MIT License | git.io/normalize */
 | 
				
			||||||
/* ==========================================================================
 | 
					/* ==========================================================================
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								build/css/Ribs.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								build/css/Ribs.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "Ribs",
 | 
					  "name": "Ribs",
 | 
				
			||||||
  "version": "1.0.5",
 | 
					  "version": "1.0.6",
 | 
				
			||||||
  "main": "css/Ribs.css",
 | 
					  "main": "css/Ribs.css",
 | 
				
			||||||
  "ignore": [
 | 
					  "ignore": [
 | 
				
			||||||
    "**/.*",
 | 
					    "**/.*",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@
 | 
				
			|||||||
  "name": "Ribs",
 | 
					  "name": "Ribs",
 | 
				
			||||||
  "title": "Ribs",
 | 
					  "title": "Ribs",
 | 
				
			||||||
  "description": "The evolution of Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
 | 
					  "description": "The evolution of Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
 | 
				
			||||||
  "version": "1.0.5",
 | 
					  "version": "1.0.6",
 | 
				
			||||||
  "homepage": "https://github.com/nickpack/Ribs",
 | 
					  "homepage": "https://github.com/nickpack/Ribs",
 | 
				
			||||||
  "author": {
 | 
					  "author": {
 | 
				
			||||||
    "name": "Nick Pack",
 | 
					    "name": "Nick Pack",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,7 @@
 | 
				
			|||||||
*
 | 
					*
 | 
				
			||||||
* Ribs is the evolution of Skeleton by Nick Pack
 | 
					* Ribs is the evolution of Skeleton by Nick Pack
 | 
				
			||||||
* Free to use under the MIT license.
 | 
					* Free to use under the MIT license.
 | 
				
			||||||
* http://www.opensource.org/licenses/mit-license.php
 | 
					* http://github.com/nickpack/Ribs
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@import "_variables";
 | 
					@import "_variables";
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user