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

Improve font variable names
vischia · Dec 29, 2017 · bdcc4d5 · bdcc4d5
2 parents a8ba74a + 8e45763
commit bdcc4d5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/_sass/_base.scss b/_sass/_base.scss
@@ -11,7 +11,7 @@ body {
 }
 
 html {
-  font-family: $baskerville;
+  font-family: $serif-primary;
   font-size: 14px;
 
   @media (min-width: 600px) {
@@ -30,7 +30,7 @@ h4,
 h5,
 h6 {
   color: $default-shade;
-  font-family: $sans-font;
+  font-family: $sans-serif;
   line-height: normal;
 }
 

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

diff --git a/_sass/_code.scss b/_sass/_code.scss
@@ -1,6 +1,6 @@
 pre,
 code {
-  font-family: $monospaced-font;
+  font-family: $monospaced;
 }
 
 code {

diff --git a/_sass/_layout.scss b/_sass/_layout.scss
@@ -61,7 +61,7 @@ footer,
 
   a {
     color: $default-color;
-    font-family: $sans-font;
+    font-family: $sans-serif;
   }
 }
 
@@ -80,7 +80,7 @@ footer,
 }
 
 footer {
-  font-family: $palatino;
+  font-family: $serif-secondary;
   padding: 2rem 0;
   text-align: center;
 

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

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

diff --git a/_sass/_variables.scss b/_sass/_variables.scss
@@ -1,3 +1,4 @@
+// Colors
 $default-color: #555;
 $default-shade: #353535;
 $default-tint: #aaa;
@@ -7,14 +8,14 @@ $grey-3: #f9f9f9;
 $white: #fff;
 $blue: #4a9ae1;
 $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;
 
+// 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) {
   -webkit-box-sizing: $type;
      -moz-box-sizing: $type;