From e160288412cccf7dcc784dcc64cf32451d970cbb Mon Sep 17 00:00:00 2001 From: Tommy Chen Date: Sun, 3 Jun 2012 10:54:48 +0800 Subject: change font variables --- sass/base/_font.scss | 6 ++---- sass/base/_layout.scss | 2 +- sass/parts/_article.scss | 2 +- sass/parts/_footer.scss | 2 +- sass/parts/_header.scss | 2 +- sass/parts/_post.scss | 2 +- sass/parts/_syntax.scss | 12 ++++++------ 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/sass/base/_font.scss b/sass/base/_font.scss index 7f61fb6..ac8b2ae 100644 --- a/sass/base/_font.scss +++ b/sass/base/_font.scss @@ -1,4 +1,2 @@ -$default: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; -$monospace: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace; - -$meta-size: 0.9em; \ No newline at end of file +$font-default: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif; +$font-mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace; \ No newline at end of file diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss index 4ac1d55..4c774f5 100644 --- a/sass/base/_layout.scss +++ b/sass/base/_layout.scss @@ -5,7 +5,7 @@ $max-width: 1000px; padding: 0; } body{ - font-family: $default; + font-family: $font-default; font-weight: 300; font-size: 14px; background: $color-background; diff --git a/sass/parts/_article.scss b/sass/parts/_article.scss index 1d9f0bd..52151ef 100644 --- a/sass/parts/_article.scss +++ b/sass/parts/_article.scss @@ -98,7 +98,7 @@ article{ .caption{ background: image-url('caption.png') 0 4px no-repeat; display: block; - font-size: $meta-size; + font-size: 0.9em; color: $color-gray02; padding-left: 25px; } diff --git a/sass/parts/_footer.scss b/sass/parts/_footer.scss index b005132..6d47846 100644 --- a/sass/parts/_footer.scss +++ b/sass/parts/_footer.scss @@ -2,5 +2,5 @@ footer{ padding: 15px 0; border-top: 1px solid $color-gray05; text-align: center; - font-size: $meta-size; + font-size: 0.9em; } \ No newline at end of file diff --git a/sass/parts/_header.scss b/sass/parts/_header.scss index 0366a55..2b645ad 100644 --- a/sass/parts/_header.scss +++ b/sass/parts/_header.scss @@ -154,7 +154,7 @@ $header-height: 30px; background: image-url('search.png') 10px center no-repeat #f2f2f2; color: $color-gray02; border: 1px solid $color-gray04; - font: 13px $default; + font: 13px $font-default; padding: 6px 15px 6px 35px; width: 100px; @include transition(0.3s); diff --git a/sass/parts/_post.scss b/sass/parts/_post.scss index 059567e..1730fb8 100644 --- a/sass/parts/_post.scss +++ b/sass/parts/_post.scss @@ -9,7 +9,7 @@ position: absolute; top: 85px; line-height: 2; - font-size: $meta-size; + font-size: 0.9em; color: $color-gray02; width: 170px; @media screen and (max-width: 800px){ diff --git a/sass/parts/_syntax.scss b/sass/parts/_syntax.scss index 7f2e537..5ad2b14 100644 --- a/sass/parts/_syntax.scss +++ b/sass/parts/_syntax.scss @@ -45,10 +45,10 @@ article{ code, pre{ background: $pre-bg; border: 1px solid $pre-border; - font-family: $monospace; + font-family: $font-mono; } code{ - font-size: $meta-size; + font-size: 0.9em; padding: 1px 3px; margin: 0 3px; @include border-radius(5px); @@ -77,7 +77,7 @@ figure.code{ padding: 5px 15px; @include border-radius(5px); figcaption{ - font-size: $meta-size; + font-size: 0.9em; position: relative; span{ margin: -5px -15px 0; @@ -106,7 +106,7 @@ figure.code{ } .line-numbers{ border-right: 1px solid $pre-border; - font-family: $monospace; + font-family: $font-mono; padding-right: 15px; text-align: right; } @@ -139,12 +139,12 @@ figure.code{ background: none; border: none; pre{ - font: $meta-size $monospace; + font: 0.9em $font-mono; line-height: 1.5; } } .gist-meta{ - font: 300 $meta-size $default; + font: 300 0.9em $font-default; line-height: 1.5; margin: 0 -16px -6px; padding: 5px 15px; -- cgit v1.1-2-g2b99