Merge branch 'release/1.0.6' into develop

This commit is contained in:
Nick Pack committed 2013-08-07 13:33:11 +01:00
commit f167d30d9e
6 files changed
+7 -5

No files matched your search

+2
View File
@@ -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: [![Build Status](https://travis-ci.org/nickpack/Ribs.png)](https://travis-ci.org/nickpack/Ribs) Master: [![Build Status](https://travis-ci.org/nickpack/Ribs.png)](https://travis-ci.org/nickpack/Ribs)
Development: [![Build Status](https://travis-ci.org/nickpack/Ribs.png?branch=develop)](https://travis-ci.org/nickpack/Ribs) Development: [![Build Status](https://travis-ci.org/nickpack/Ribs.png?branch=develop)](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
+1 -1
View File
@@ -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 */
/* ========================================================================== /* ==========================================================================
+1 -1
View File
@@ -1,2 +1,2 @@
/* Ribs 1.0.5 - https://github.com/nickpack/Ribs - 21-07-2013 */ /* Ribs 1.0.6 - https://github.com/nickpack/Ribs - 07-08-2013 */
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}body{background:#fff;font:14px/21px HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#444;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}hr{border:solid #ddd;border-width:1px 0 0;clear:both;margin:10px 0 30px;height:0}.container{position:relative;margin:0 auto;padding:0}.container .alpha{margin-left:0}.container .omega{margin-right:0}.column,.columns{float:left;margin-left:10px;margin-right:10px}.alpha-omega{margin-right:0;margin-left:0}.row{margin-bottom:20px}.container{width:960px}.container .one{width:40px}.container .two{width:100px}.container .three{width:160px}.container .four{width:220px}.container .five{width:280px}.container .six{width:340px}.container .seven{width:400px}.container .eight{width:460px}.container .nine{width:520px}.container .ten{width:580px}.container .eleven{width:640px}.container .twelve{width:700px}.container .thirteen{width:760px}.container .fourteen{width:820px}.container .fifteen{width:880px}.container .sixteen{width:940px}.container .one-third{width:300px}.container .two-thirds{width:620px}.container .one-half{width:460px}.container .one-quarter{width:220px}.container .three-quarters{width:700px}.container .offset-by-one{padding-left:60px}.container .offset-by-two{padding-left:120px}.container .offset-by-three{padding-left:180px}.container .offset-by-four{padding-left:240px}.container .offset-by-five{padding-left:300px}.container .offset-by-six{padding-left:360px}.container .offset-by-seven{padding-left:420px}.container .offset-by-eight{padding-left:480px}.container .offset-by-nine{padding-left:540px}.container .offset-by-ten{padding-left:600px}.container .offset-by-eleven{padding-left:660px}.container .offset-by-twelve{padding-left:720px}.container .offset-by-thirteen{padding-left:780px}.container .offset-by-fourteen{padding-left:840px}.container .offset-by-fifteen{padding-left:900px}.container .pull-by-one{left:-60px}.container .pull-by-two{left:-120px}.container .pull-by-three{left:-180px}.container .pull-by-four{left:-240px}.container .pull-by-five{left:-300px}.container .pull-by-six{left:-360px}.container .pull-by-seven{left:-420px}.container .pull-by-eight{left:-480px}.container .pull-by-nine{left:-540px}.container .pull-by-ten{left:-600px}.container .pull-by-eleven{left:-660px}.container .pull-by-twelve{left:-720px}.container .pull-by-thirteen{left:-780px}.container .pull-by-fourteen{left:-840px}.container .pull-by-fifteen{left:-900px}.container .push-by-one{left:60px}.container .push-by-two{left:120px}.container .push-by-three{left:180px}.container .push-by-four{left:240px}.container .push-by-five{left:300px}.container .push-by-six{left:360px}.container .push-by-seven{left:420px}.container .push-by-eight{left:480px}.container .push-by-nine{left:540px}.container .push-by-ten{left:600px}.container .push-by-eleven{left:660px}.container .push-by-twelve{left:720px}.container .push-by-thirteen{left:780px}.container .push-by-fourteen{left:840px}.container .push-by-fifteen{left:900px}@media only screen and (max-width:959px){.container{width:768px}.container .one{width:28px}.container .two{width:76px}.container .three{width:124px}.container .four{width:172px}.container .five{width:220px}.cLine truncated article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}body{background:#fff;font:14px/21px HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#444;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}hr{border:solid #ddd;border-width:1px 0 0;clear:both;margin:10px 0 30px;height:0}.container{position:relative;margin:0 auto;padding:0}.container .alpha{margin-left:0}.container .omega{margin-right:0}.column,.columns{float:left;margin-left:10px;margin-right:10px}.alpha-omega{margin-right:0;margin-left:0}.row{margin-bottom:20px}.container{width:960px}.container .one{width:40px}.container .two{width:100px}.container .three{width:160px}.container .four{width:220px}.container .five{width:280px}.container .six{width:340px}.container .seven{width:400px}.container .eight{width:460px}.container .nine{width:520px}.container .ten{width:580px}.container .eleven{width:640px}.container .twelve{width:700px}.container .thirteen{width:760px}.container .fourteen{width:820px}.container .fifteen{width:880px}.container .sixteen{width:940px}.container .one-third{width:300px}.container .two-thirds{width:620px}.container .one-half{width:460px}.container .one-quarter{width:220px}.container .three-quarters{width:700px}.container .offset-by-one{padding-left:60px}.container .offset-by-two{padding-left:120px}.container .offset-by-three{padding-left:180px}.container .offset-by-four{padding-left:240px}.container .offset-by-five{padding-left:300px}.container .offset-by-six{padding-left:360px}.container .offset-by-seven{padding-left:420px}.container .offset-by-eight{padding-left:480px}.container .offset-by-nine{padding-left:540px}.container .offset-by-ten{padding-left:600px}.container .offset-by-eleven{padding-left:660px}.container .offset-by-twelve{padding-left:720px}.container .offset-by-thirteen{padding-left:780px}.container .offset-by-fourteen{padding-left:840px}.container .offset-by-fifteen{padding-left:900px}.container .pull-by-one{left:-60px}.container .pull-by-two{left:-120px}.container .pull-by-three{left:-180px}.container .pull-by-four{left:-240px}.container .pull-by-five{left:-300px}.container .pull-by-six{left:-360px}.container .pull-by-seven{left:-420px}.container .pull-by-eight{left:-480px}.container .pull-by-nine{left:-540px}.container .pull-by-ten{left:-600px}.container .pull-by-eleven{left:-660px}.container .pull-by-twelve{left:-720px}.container .pull-by-thirteen{left:-780px}.container .pull-by-fourteen{left:-840px}.container .pull-by-fifteen{left:-900px}.container .push-by-one{left:60px}.container .push-by-two{left:120px}.container .push-by-three{left:180px}.container .push-by-four{left:240px}.container .push-by-five{left:300px}.container .push-by-six{left:360px}.container .push-by-seven{left:420px}.container .push-by-eight{left:480px}.container .push-by-nine{left:540px}.container .push-by-ten{left:600px}.container .push-by-eleven{left:660px}.container .push-by-twelve{left:720px}.container .push-by-thirteen{left:780px}.container .push-by-fourteen{left:840px}.container .push-by-fifteen{left:900px}@media only screen and (max-width:959px){.container{width:768px}.container .one{width:28px}.container .two{width:76px}.container .three{width:124px}.container .four{width:172px}.container .five{width:220px}.cLine truncated
+1 -1
View File
@@ -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": [
"**/.*", "**/.*",
+1 -1
View File
@@ -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",
+1 -1
View File
@@ -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";