Merge branch 'release/1.0.2' into develop
This commit is contained in:
		@@ -14,6 +14,11 @@ Either clone this repository and drop in manually, or install from bower:
 | 
			
		||||
bower install --save Skeleton-SCSS
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
## Build status
 | 
			
		||||
The project is set up to build and run csslint on Travis:
 | 
			
		||||
Master: [](https://travis-ci.org/nickpack/Skeleton-SCSS)
 | 
			
		||||
Development: [](https://travis-ci.org/nickpack/Skeleton-SCSS)
 | 
			
		||||
 | 
			
		||||
## Building
 | 
			
		||||
I've added grunt configuration to the repository for those of you that use it.
 | 
			
		||||
 | 
			
		||||
@@ -30,6 +35,7 @@ Then following that, from the root dir of this project, run `npm install` which
 | 
			
		||||
You should be good to go.
 | 
			
		||||
 | 
			
		||||
## Changelog
 | 
			
		||||
* May 17, 2013 - (v1.0.2) Travis CI build configuration, and minor refactor to remove as many of the warnings from CSSLint as was feasible to do - MAY CAUSE REGRESSIONS.
 | 
			
		||||
* May 17, 2013 - (v1.0.1) Added grunt build tools
 | 
			
		||||
* Apr 23, 2013 - (v1.0.0) Skeleton SCSS v1.0 - Additional variable conversions, changes based on feedback to the original project and bower submission.
 | 
			
		||||
* Jan 31, 2013 - Completed SCSS conversion of Skeleton 1.2.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "Skeleton-SCSS",
 | 
			
		||||
  "version": "1.0.1",
 | 
			
		||||
  "version": "1.0.2",
 | 
			
		||||
  "main": "css/skeleton.css",
 | 
			
		||||
  "ignore": [
 | 
			
		||||
    "**/.*",
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								css/skeleton.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								css/skeleton.css
									
									
									
									
										vendored
									
									
								
							@@ -1,5 +1,5 @@
 | 
			
		||||
/*
 | 
			
		||||
* Skeleton SCSS V1.0.1
 | 
			
		||||
* Skeleton SCSS V1.0.2
 | 
			
		||||
* Skeleton is Copyright 2011, Dave Gamache
 | 
			
		||||
*
 | 
			
		||||
* SCSS Conversion and Mixins by Nick Pack
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								css/skeleton.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								css/skeleton.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -2,7 +2,7 @@
 | 
			
		||||
  "name": "Skeleton-SCSS",
 | 
			
		||||
  "title": "Skeleton SCSS",
 | 
			
		||||
  "description": "Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
 | 
			
		||||
  "version": "1.0.1",
 | 
			
		||||
  "version": "1.0.2",
 | 
			
		||||
  "homepage": "https://github.com/nickpack/Skeleton-SCSS",
 | 
			
		||||
  "author": {
 | 
			
		||||
    "name": "Nick Pack",
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								scss/skeleton.scss
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								scss/skeleton.scss
									
									
									
									
										vendored
									
									
								
							@@ -1,5 +1,5 @@
 | 
			
		||||
/*
 | 
			
		||||
* Skeleton SCSS V1.0.1
 | 
			
		||||
* Skeleton SCSS V1.0.2
 | 
			
		||||
* Skeleton is Copyright 2011, Dave Gamache
 | 
			
		||||
*
 | 
			
		||||
* SCSS Conversion and Mixins by Nick Pack
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user