mirrors/tale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15 from chesterhow/better-variable-names

Browse source 
Improve font variable names
This commit is contained in:
Chester How 2017-12-29 14:50:57 +08:00 committed by GitHub
commit bdcc4d5e60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
_sass/_base.scss
View file

@ -11,7 +11,7 @@ body {
} }
html { html {
font-family: $baskerville; font-family: $serif-primary;
font-size: 14px; font-size: 14px;
@media (min-width: 600px) { @media (min-width: 600px) {
@ -30,7 +30,7 @@ h4,
h5, h5,
h6 { h6 {
color: $default-shade; color: $default-shade;
font-family: $sans-font; font-family: $sans-serif;
line-height: normal; line-height: normal;
} }

4
_sass/_catalogue.scss
View file

@ -17,14 +17,14 @@
&-time { &-time {
color: $default-tint; color: $default-tint;
font-family: $palatino; font-family: $serif-secondary;
letter-spacing: .5px; letter-spacing: .5px;
} }
&-title { &-title {
color: $default-shade; color: $default-shade;
display: block; display: block;
font-family: $sans-font; font-family: $sans-serif;
font-size: 2rem; font-size: 2rem;
font-weight: 700; font-weight: 700;
margin: .5rem 0; margin: .5rem 0;

2
_sass/_code.scss
View file

@ -1,6 +1,6 @@
pre, pre,
code { code {
font-family: $monospaced-font; font-family: $monospaced;
} }
code { code {

4
_sass/_layout.scss
View file

@ -61,7 +61,7 @@ footer,
a { a {
color: $default-color; color: $default-color;
font-family: $sans-font; font-family: $sans-serif;
} }
} }
@ -80,7 +80,7 @@ footer,
} }
footer { footer {
font-family: $palatino; font-family: $serif-secondary;
padding: 2rem 0; padding: 2rem 0;
text-align: center; text-align: center;

4
_sass/_pagination.scss
View file

@ -1,6 +1,6 @@
.pagination { .pagination {
border-top: .5px solid $grey-2; border-top: .5px solid $grey-2;
font-family: $palatino; font-family: $serif-secondary;
padding-top: 2rem; padding-top: 2rem;
position: relative; position: relative;
text-align: center; text-align: center;
@ -13,7 +13,7 @@
.top { .top {
@include transition(all .3s ease-out); @include transition(all .3s ease-out);
color: $default-color; color: $default-color;
font-family: $sans-font; font-family: $sans-serif;
font-size: 1.1rem; font-size: 1.1rem;
opacity: .6; opacity: .6;

6
_sass/_post.scss
View file

@ -3,7 +3,7 @@
&-info { &-info {
color: $default-tint; color: $default-tint;
font-family: $palatino; font-family: $serif-secondary;
letter-spacing: 0.5px; letter-spacing: 0.5px;
text-align: center; text-align: center;
@ -14,7 +14,7 @@
&-title { &-title {
color: $default-shade; color: $default-shade;
font-family: $sans-font; font-family: $sans-serif;
font-size: 4rem; font-size: 4rem;
margin: 1rem 0; margin: 1rem 0;
text-align: center; text-align: center;
@ -43,7 +43,7 @@
img + em { img + em {
color: $default-tint; color: $default-tint;
display: block; display: block;
font-family: $sans-font; font-family: $sans-serif;
font-size: 0.9rem; font-size: 0.9rem;
font-style: normal; font-style: normal;
text-align: center; text-align: center;

13
_sass/_variables.scss
View file

@ -1,3 +1,4 @@
// Colors
$default-color: #555; $default-color: #555;
$default-shade: #353535; $default-shade: #353535;
$default-tint: #aaa; $default-tint: #aaa;
@ -7,14 +8,14 @@ $grey-3: #f9f9f9;
$white: #fff; $white: #fff;
$blue: #4a9ae1; $blue: #4a9ae1;
$shadow-color: rgba(0, 0, 0, .2); $shadow-color: rgba(0, 0, 0, .2);
$baskerville: 'Libre Baskerville', 'Times New Roman', Times, serif;
$palatino: Palatino, 'Palatino LT STD', 'Palatino Linotype', 'Book Antiqua', 'Georgia', serif;
$sans-font: 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif;
$monospaced-font: Menlo, Monaco, monospace;
$code-color: #bf616a; $code-color: #bf616a;
// Fonts
$serif-primary: 'Libre Baskerville', 'Times New Roman', Times, serif;
$serif-secondary: Palatino, 'Palatino LT STD', 'Palatino Linotype', 'Book Antiqua', 'Georgia', serif;
$sans-serif: 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif;
$monospaced: Menlo, Monaco, monospace;
@mixin box-sizing($type: border-box) { @mixin box-sizing($type: border-box) {
-webkit-box-sizing: $type; -webkit-box-sizing: $type;
-moz-box-sizing: $type; -moz-box-sizing: $type;