Merge branch 'release/1.0.1' into develop

This commit is contained in:
Nick Pack 2013-05-17 11:23:45 +01:00
commit 33c4cfdb75
4 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "Skeleton-SCSS", "name": "Skeleton-SCSS",
"version": "1.0.0", "version": "1.0.1",
"main": "css/skeleton.css", "main": "css/skeleton.css",
"ignore": [ "ignore": [
"**/.*", "**/.*",

View File

@ -42,7 +42,7 @@
<div class="container"> <div class="container">
<div class="sixteen columns"> <div class="sixteen columns">
<h1 class="remove-bottom" style="margin-top: 40px">Skeleton-SCSS</h1> <h1 class="remove-bottom" style="margin-top: 40px">Skeleton-SCSS</h1>
<h5>Version 1.0</h5> <h5>Version 1.0.1</h5>
<hr /> <hr />
</div> </div>
<div class="one-third column"> <div class="one-third column">

View File

@ -2,7 +2,7 @@
"name": "Skeleton-SCSS", "name": "Skeleton-SCSS",
"title": "Skeleton SCSS", "title": "Skeleton SCSS",
"description": "Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.", "description": "Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
"version": "1.0.0", "version": "1.0.1",
"homepage": "https://github.com/nickpack/Skeleton-SCSS", "homepage": "https://github.com/nickpack/Skeleton-SCSS",
"author": { "author": {
"name": "Nick Pack", "name": "Nick Pack",

2
scss/skeleton.scss vendored
View File

@ -1,5 +1,5 @@
/* /*
* Skeleton SCSS V1.0 * Skeleton SCSS V1.0.1
* Skeleton is Copyright 2011, Dave Gamache * Skeleton is Copyright 2011, Dave Gamache
* *
* SCSS Conversion and Mixins by Nick Pack * SCSS Conversion and Mixins by Nick Pack