Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Shick 2014-12-29 15:49:28 -05:00
commit c220b8598a
4 changed files with 65 additions and 44 deletions

View File

@ -6,7 +6,7 @@ Check out <http://getskeleton.com> for documentation and details.
## Getting started ## Getting started
There are a couple ways to download Skeleton: There are a couple ways to download Skeleton:
- [Download the zip](https://github.com/dhg/Skeleton/releases/download/v2.0.2/Skeleton-2.0.2.zip) - [Download the zip](https://github.com/dhg/Skeleton/releases/download/2.0.4/Skeleton-2.0.4.zip)
- Clone the repo: `git clone https://github.com/dhg/Skeleton.git` (Note: this is under active development, so if you're looking for stable and safe, use the zipped download) - Clone the repo: `git clone https://github.com/dhg/Skeleton.git` (Note: this is under active development, so if you're looking for stable and safe, use the zipped download)
@ -53,7 +53,7 @@ All parts of Skeleton are free to use and abuse under the [open-source MIT licen
The following are extensions to Skeleton built by the community. They are not officially supported, but all have been tested and are compatible with v2.0 (exact release noted): The following are extensions to Skeleton built by the community. They are not officially supported, but all have been tested and are compatible with v2.0 (exact release noted):
- [Skeleton on LESS](https://github.com/whatsnewsaes/Skeleton-less): Skeleton built with LESS for easier replacement of grid, color, and media queries. (Last update was to match v2.0.1) - [Skeleton on LESS](https://github.com/whatsnewsaes/Skeleton-less): Skeleton built with LESS for easier replacement of grid, color, and media queries. (Last update was to match v2.0.1)
- [Skeleton on SASS](https://github.com/whatsnewsaes/Skeleton-Sass): Skeleton built with SASS for easier replacement of grid, color, and media queries. (Last update was to match v2.0.1) - [Skeleton on Sass](https://github.com/whatsnewsaes/Skeleton-Sass): Skeleton built with Sass for easier replacement of grid, color, and media queries. (Last update was to match v2.0.1)
Have an extension you want to see here? Just shoot an email to hi@getskeleton.com with your extension! Have an extension you want to see here? Just shoot an email to hi@getskeleton.com with your extension!

21
bower.json Normal file
View File

@ -0,0 +1,21 @@
{
"name": "skeleton",
"version": "2.0.4",
"homepage": "http://getskeleton.com/",
"repository": {
"type": "git",
"url": "https://github.com/dhg/Skeleton"
},
"authors": [
"Dave Gamache <hello@davegamache.com> (http://davegamache.com/)"
],
"description": "Skeleton is a dead-simple, responsive boilerplate to kickstart any responsive project.",
"main": "css/skeleton.css",
"keywords": [
"css",
"skeleton",
"responsive",
"boilerplate"
],
"license": "MIT"
}

12
css/skeleton.css vendored
View File

@ -1,10 +1,10 @@
/* /*
* Skeleton V2.0.2 * Skeleton V2.0.4
* Copyright 2014, Dave Gamache * Copyright 2014, Dave Gamache
* www.getskeleton.com * www.getskeleton.com
* Free to use under the MIT license. * Free to use under the MIT license.
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* 12/15/2014 * 12/29/2014
*/ */
@ -226,6 +226,7 @@ input[type="button"].button-primary:focus {
/* Forms /* Forms
*/ */
input[type="email"], input[type="email"],
input[type="number"],
input[type="search"], input[type="search"],
input[type="text"], input[type="text"],
input[type="tel"], input[type="tel"],
@ -240,8 +241,9 @@ select {
border-radius: 4px; border-radius: 4px;
box-shadow: none; box-shadow: none;
box-sizing: border-box; } box-sizing: border-box; }
/* Removes awkard default styles on some inputs for iOS */ /* Removes awkward default styles on some inputs for iOS */
input[type="email"], input[type="email"],
input[type="number"],
input[type="search"], input[type="search"],
input[type="text"], input[type="text"],
input[type="tel"], input[type="tel"],
@ -256,6 +258,7 @@ textarea {
padding-top: 6px; padding-top: 6px;
padding-bottom: 6px; } padding-bottom: 6px; }
input[type="email"]:focus, input[type="email"]:focus,
input[type="number"]:focus,
input[type="search"]:focus, input[type="search"]:focus,
input[type="text"]:focus, input[type="text"]:focus,
input[type="tel"]:focus, input[type="tel"]:focus,
@ -344,7 +347,6 @@ fieldset {
margin-bottom: 1.5rem; } margin-bottom: 1.5rem; }
pre, pre,
blockquote, blockquote,
form,
dl, dl,
figure, figure,
table, table,
@ -353,8 +355,6 @@ ul,
ol, ol,
form { form {
margin-bottom: 2.5rem; } margin-bottom: 2.5rem; }
p {
margin-top: 0; }
/* Utilities /* Utilities

View File

@ -15,7 +15,7 @@
<!-- FONT <!-- FONT
--> -->
<link href='//fonts.googleapis.com/css?family=Raleway:400,300,600' rel='stylesheet' type='text/css'> <link href="//fonts.googleapis.com/css?family=Raleway:400,300,600" rel="stylesheet" type="text/css">
<!-- CSS <!-- CSS
--> -->
@ -24,7 +24,7 @@
<!-- Favicon <!-- Favicon
--> -->
<link rel="icon" type="image/png" href="images/favicon.png" /> <link rel="icon" type="image/png" href="images/favicon.png">
</head> </head>
<body> <body>