Merge branch 'release/1.0.3'

This commit is contained in:
Nick Pack committed 2013-05-30 09:38:25 +01:00
commit c0cdc18d4e
8 files changed
+25 -20

No files matched your search

+1
View File
@@ -35,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 30, 2013 - (v1.0.3) Added 1.5 * font size line heights to headings and paragraphs
* May 28, 2013 - Rename project to Ribs
* 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
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Ribs",
"version": "1.0.2",
"version": "1.0.3",
"main": "css/Ribs.css",
"ignore": [
"**/.*",
+8 -7
View File
@@ -320,7 +320,7 @@ h1 {
font-family: "Georgia", "Times New Roman", serif;
font-weight: normal;
font-size: 46px;
line-height: 50px;
line-height: 69px;
margin: 0 0 14px 0; }
h2 {
@@ -328,7 +328,7 @@ h2 {
font-family: "Georgia", "Times New Roman", serif;
font-weight: normal;
font-size: 35px;
line-height: 40px;
line-height: 52.5px;
margin: 0 0 10px 0; }
h3 {
@@ -336,7 +336,7 @@ h3 {
font-family: "Georgia", "Times New Roman", serif;
font-weight: normal;
font-size: 28px;
line-height: 34px;
line-height: 42px;
margin: 0 0 8px 0; }
h4 {
@@ -344,7 +344,7 @@ h4 {
font-family: "Georgia", "Times New Roman", serif;
font-weight: normal;
font-size: 21px;
line-height: 30px;
line-height: 31.5px;
margin: 0 0 4px 0; }
h5 {
@@ -352,7 +352,7 @@ h5 {
font-family: "Georgia", "Times New Roman", serif;
font-weight: normal;
font-size: 17px;
line-height: 24px; }
line-height: 25.5px; }
h6 {
color: #181818;
@@ -365,14 +365,15 @@ h6 {
color: #777777; }
p {
margin: 0 0 20px 0; }
margin: 0 0 20px 0;
line-height: 21px; }
p img {
margin: 0; }
.lead {
font-size: 21px;
line-height: 27px;
line-height: 31.5px;
color: #777777; }
em {
+2 -2
View File
@@ -1,2 +1,2 @@
/* Ribs 1.0.2 28-05-2013 */
html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}.remove-bottom{margin-bottom:0}.half-bottom{margin-bottom:10px}.add-bottom{margin-bottom:20px}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%}.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}.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}@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}.container .six{width:268px}.container .seven{width:316px}.container .eight{width:364px}.container .nine{width:412px}.container .ten{width:460px}.container .eleven{width:508px}.container .twelve{width:556px}.container .thirteen{width:604px}.container .fourteen{width:652px}.container .fifteen{width:700px}.container .sixteen{width:748px}.container .one-third{width:236px}.container .two-thirds{width:492px}.container .one-half{width:364px}.container .one-quarter{width:172px}.container .three-quarters{width:556px}.container .offset-by-one{padding-left:48px}.container .offset-by-two{padding-left:96px}.container .offset-by-three{padding-left:144px}.container .offset-by-four{padding-left:192px}.container .offset-by-five{padding-left:240px}.container .offset-by-six{padding-left:288px}.container .offset-by-seven{padding-left:336px}.container .offset-by-eight{padding-left:384px}.container .offset-by-nine{padding-left:432px}.container .offset-by-ten{padding-left:480px}.container .offset-by-eleven{padding-left:528px}.container .offset-by-twelve{padding-left:576px}.container .offset-by-thirteen{padding-left:624px}.container .offset-by-fourteen{padding-left:672px}.container .offset-by-fifteen{padding-left:720px}.container{width:768px}.container .alpha{margin-right:10px}.container .omega{margin-left:10px}.alpha-omega{margin-right:0;margin-left:0}}@media only screen and (max-width:767px){.container{width:90%}.container .one,.container .two,.container .three,.container .four,.container .five,.container .six,.container .seven,.container .eight,.container .nine,.container .ten,.container .eleven,.container .twelve,.container .thirteen,.container .fourteen,.container .fifteen,.container .sixteen,.container .one-third,.container .two-thirds,.container .one-half,.container .one-quarter,.container .three-quarters{width:100%}.container .column,.container .columns{margin:0}.container .offset-by-one,.container .offset-by-two,.container .offset-by-three,.container .offset-by-four,.container .offset-by-five,.container .offset-by-six,.container .offset-by-seven,.container .offset-by-eight,.container .offset-by-nine,.container .offset-by-ten,.container .offset-by-elevenLine truncated
/* Ribs 1.0.2 30-05-2013 */
html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}.remove-bottom{margin-bottom:0}.half-bottom{margin-bottom:10px}.add-bottom{margin-bottom:20px}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%}.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}.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}@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}.container .six{width:268px}.container .seven{width:316px}.container .eight{width:364px}.container .nine{width:412px}.container .ten{width:460px}.container .eleven{width:508px}.container .twelve{width:556px}.container .thirteen{width:604px}.container .fourteen{width:652px}.container .fifteen{width:700px}.container .sixteen{width:748px}.container .one-third{width:236px}.container .two-thirds{width:492px}.container .one-half{width:364px}.container .one-quarter{width:172px}.container .three-quarters{width:556px}.container .offset-by-one{padding-left:48px}.container .offset-by-two{padding-left:96px}.container .offset-by-three{padding-left:144px}.container .offset-by-four{padding-left:192px}.container .offset-by-five{padding-left:240px}.container .offset-by-six{padding-left:288px}.container .offset-by-seven{padding-left:336px}.container .offset-by-eight{padding-left:384px}.container .offset-by-nine{padding-left:432px}.container .offset-by-ten{padding-left:480px}.container .offset-by-eleven{padding-left:528px}.container .offset-by-twelve{padding-left:576px}.container .offset-by-thirteen{padding-left:624px}.container .offset-by-fourteen{padding-left:672px}.container .offset-by-fifteen{padding-left:720px}.container{width:768px}.container .alpha{margin-right:10px}.container .omega{margin-left:10px}.alpha-omega{margin-right:0;margin-left:0}}@media only screen and (max-width:767px){.container{width:90%}.container .one,.container .two,.container .three,.container .four,.container .five,.container .six,.container .seven,.container .eight,.container .nine,.container .ten,.container .eleven,.container .twelve,.container .thirteen,.container .fourteen,.container .fifteen,.container .sixteen,.container .one-third,.container .two-thirds,.container .one-half,.container .one-quarter,.container .three-quarters{width:100%}.container .column,.container .columns{margin:0}.container .offset-by-one,.container .offset-by-two,.container .offset-by-three,.container .offset-by-four,.container .offset-by-five,.container .offset-by-six,.container .offset-by-seven,.container .offset-by-eight,.container .offset-by-nine,.container .offset-by-ten,.container .offset-by-elevenLine truncated
+2 -2
View File
@@ -41,8 +41,8 @@
<div class="container">
<div class="sixteen columns">
<h1 class="remove-bottom" style="margin-top: 40px">Skeleton-SCSS</h1>
<h5>Version 1.0.2</h5>
<h1 class="remove-bottom" style="margin-top: 40px">Ribs</h1>
<h5>Version 1.0.3</h5>
<hr />
</div>
<div class="one-third column">
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "Ribs",
"title": "Ribs",
"description": "The evolution of Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
"version": "1.0.2",
"version": "1.0.3",
"homepage": "https://github.com/nickpack/Ribs",
"author": {
"name": "Nick Pack",
+1
View File
@@ -73,6 +73,7 @@ h6 {
p {
margin: $paragraph_margin;
line-height: $paragraph_line_height;
}
p img {
+9 -7
View File
@@ -4,6 +4,7 @@ $desktop-container-width: 960px;
$tablet-container-width: 768px;
$mobile-container-width: 90%;
$mobile-column-width: 100%;
$base_font_size: 14px;
$form_element_font: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -57,34 +58,35 @@ $heading_font_weight: normal;
$heading_colour: #181818;
$heading1_font_size: 46px;
$heading1_line_height: 50px;
$heading1_line_height: $heading1_font_size * 1.5;
$heading1_margin: 0 0 14px 0;
$heading2_font_size: 35px;
$heading2_line_height: 40px;
$heading2_line_height: $heading2_font_size * 1.5;
$heading2_margin: 0 0 10px 0;
$heading3_font_size: 28px;
$heading3_line_height: 34px;
$heading3_line_height: $heading3_font_size * 1.5;
$heading3_margin: 0 0 8px 0;
$heading4_font_size: 21px;
$heading4_line_height: 30px;
$heading4_line_height: $heading4_font_size * 1.5;
$heading4_margin: 0 0 4px 0;
$heading5_font_size: 17px;
$heading5_line_height: 24px;
$heading5_line_height: $heading5_font_size * 1.5;
$heading6_font_size: 14px;
$heading6_line_height: 21px;
$heading6_line_height: $heading6_font_size * 1.5;
$subheader_colour: #777;
$paragraph_margin: 0 0 20px 0;
$paragraph_image_margin: 0;
$paragraph_line_height: $base_font_size * 1.5;
$paragraph_lead_font_size: 21px;
$paragraph_lead_line_height: 27px;
$paragraph_lead_line_height: $paragraph_lead_font_size * 1.5;
$paragraph_lead_colour: #777;
$strong_colour: #333;