BitGoblin/Bones
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.0.3'

Browse Source
This commit is contained in:
Nick Pack
2013-05-30 09:38:25 +01:00
parent 834a9e985a 25578427fa
commit c0cdc18d4e
8 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
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. You should be good to go.
## Changelog ## 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 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.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 * May 17, 2013 - (v1.0.1) Added grunt build tools

2
component.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "Ribs", "name": "Ribs",
"version": "1.0.2", "version": "1.0.3",
"main": "css/Ribs.css", "main": "css/Ribs.css",
"ignore": [ "ignore": [
"**/.*", "**/.*",

15
css/Ribs.css
View File

@@ -320,7 +320,7 @@ h1 {
font-family: "Georgia", "Times New Roman", serif; font-family: "Georgia", "Times New Roman", serif;
font-weight: normal; font-weight: normal;
font-size: 46px; font-size: 46px;
line-height: 50px; line-height: 69px;
margin: 0 0 14px 0; } margin: 0 0 14px 0; }
h2 { h2 {
@@ -328,7 +328,7 @@ h2 {
font-family: "Georgia", "Times New Roman", serif; font-family: "Georgia", "Times New Roman", serif;
font-weight: normal; font-weight: normal;
font-size: 35px; font-size: 35px;
line-height: 40px; line-height: 52.5px;
margin: 0 0 10px 0; } margin: 0 0 10px 0; }
h3 { h3 {
@@ -336,7 +336,7 @@ h3 {
font-family: "Georgia", "Times New Roman", serif; font-family: "Georgia", "Times New Roman", serif;
font-weight: normal; font-weight: normal;
font-size: 28px; font-size: 28px;
line-height: 34px; line-height: 42px;
margin: 0 0 8px 0; } margin: 0 0 8px 0; }
h4 { h4 {
@@ -344,7 +344,7 @@ h4 {
font-family: "Georgia", "Times New Roman", serif; font-family: "Georgia", "Times New Roman", serif;
font-weight: normal; font-weight: normal;
font-size: 21px; font-size: 21px;
line-height: 30px; line-height: 31.5px;
margin: 0 0 4px 0; } margin: 0 0 4px 0; }
h5 { h5 {
@@ -352,7 +352,7 @@ h5 {
font-family: "Georgia", "Times New Roman", serif; font-family: "Georgia", "Times New Roman", serif;
font-weight: normal; font-weight: normal;
font-size: 17px; font-size: 17px;
line-height: 24px; } line-height: 25.5px; }
h6 { h6 {
color: #181818; color: #181818;
@@ -365,14 +365,15 @@ h6 {
color: #777777; } color: #777777; }
p { p {
margin: 0 0 20px 0; } margin: 0 0 20px 0;
line-height: 21px; }
p img { p img {
margin: 0; } margin: 0; }
.lead { .lead {
font-size: 21px; font-size: 21px;
line-height: 27px; line-height: 31.5px;
color: #777777; } color: #777777; }
em { em {

4
css/Ribs.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
index.html
View File

@@ -41,8 +41,8 @@
<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">Ribs</h1>
<h5>Version 1.0.2</h5> <h5>Version 1.0.3</h5>
<hr /> <hr />
</div> </div>
<div class="one-third column"> <div class="one-third column">

2
package.json
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.2", "version": "1.0.3",
"homepage": "https://github.com/nickpack/Ribs", "homepage": "https://github.com/nickpack/Ribs",
"author": { "author": {
"name": "Nick Pack", "name": "Nick Pack",

1
scss/_typography.scss
View File

@@ -73,6 +73,7 @@ h6 {
p { p {
margin: $paragraph_margin; margin: $paragraph_margin;
line-height: $paragraph_line_height;
} }
p img { p img {

16
scss/_variables.scss
View File

@@ -4,6 +4,7 @@ $desktop-container-width: 960px;
$tablet-container-width: 768px; $tablet-container-width: 768px;
$mobile-container-width: 90%; $mobile-container-width: 90%;
$mobile-column-width: 100%; $mobile-column-width: 100%;
$base_font_size: 14px;
$form_element_font: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; $form_element_font: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -57,34 +58,35 @@ $heading_font_weight: normal;
$heading_colour: #181818; $heading_colour: #181818;
$heading1_font_size: 46px; $heading1_font_size: 46px;
$heading1_line_height: 50px; $heading1_line_height: $heading1_font_size * 1.5;
$heading1_margin: 0 0 14px 0; $heading1_margin: 0 0 14px 0;
$heading2_font_size: 35px; $heading2_font_size: 35px;
$heading2_line_height: 40px; $heading2_line_height: $heading2_font_size * 1.5;
$heading2_margin: 0 0 10px 0; $heading2_margin: 0 0 10px 0;
$heading3_font_size: 28px; $heading3_font_size: 28px;
$heading3_line_height: 34px; $heading3_line_height: $heading3_font_size * 1.5;
$heading3_margin: 0 0 8px 0; $heading3_margin: 0 0 8px 0;
$heading4_font_size: 21px; $heading4_font_size: 21px;
$heading4_line_height: 30px; $heading4_line_height: $heading4_font_size * 1.5;
$heading4_margin: 0 0 4px 0; $heading4_margin: 0 0 4px 0;
$heading5_font_size: 17px; $heading5_font_size: 17px;
$heading5_line_height: 24px; $heading5_line_height: $heading5_font_size * 1.5;
$heading6_font_size: 14px; $heading6_font_size: 14px;
$heading6_line_height: 21px; $heading6_line_height: $heading6_font_size * 1.5;
$subheader_colour: #777; $subheader_colour: #777;
$paragraph_margin: 0 0 20px 0; $paragraph_margin: 0 0 20px 0;
$paragraph_image_margin: 0; $paragraph_image_margin: 0;
$paragraph_line_height: $base_font_size * 1.5;
$paragraph_lead_font_size: 21px; $paragraph_lead_font_size: 21px;
$paragraph_lead_line_height: 27px; $paragraph_lead_line_height: $paragraph_lead_font_size * 1.5;
$paragraph_lead_colour: #777; $paragraph_lead_colour: #777;
$strong_colour: #333; $strong_colour: #333;