dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3360 from nternetinspired/font-css-syntax

This commit is contained in:
Parker Moore 2015-02-02 09:57:36 -08:00
parent e71c23981d 2745be736e
commit 2bec317a2a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/site_template/_sass/_base.scss
View File

@ -14,10 +14,7 @@ dl, dd, ol, ul, figure {
* Basic styling
*/
body {
font-family: $base-font-family;
font-size: $base-font-size;
line-height: $base-line-height;
font-weight: 300;
font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
color: $text-color;
background-color: $background-color;
-webkit-text-size-adjust: 100%;
@ -80,7 +77,7 @@ li {
* Headings
*/
h1, h2, h3, h4, h5, h6 {
font-weight: 300;
font-weight: $base-font-weight;
}

1
lib/site_template/css/main.scss
View File

@ -8,6 +8,7 @@
// Our variables
$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
$base-font-size: 16px;
$base-font-weight: 300;
$small-font-size: $base-font-size * 0.875;
$base-line-height: 1.5;