Merge pull request #270 from reiner-dolp/gh-pages

Reapply #263, Fix #269
rust-lang · Sep 13, 2018 · 9cbbaa1 · 9cbbaa1
2 parents fe01f3f + e82a897
commit 9cbbaa1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/_sass/_base.scss b/_sass/_base.scss
@@ -15,9 +15,7 @@ dl, dd, ol, ul, figure {
  */
 body {
     font-family: $base-font-family;
-    font-size: $base-font-size;
-    line-height: $base-line-height;
-    font-weight: 300;
+    font-size: 1em;
     color: $text-color;
     background-color: $background-color;
 }
@@ -110,9 +108,6 @@ blockquote {
     color: $grey-color;
     border-left: 4px solid $grey-color-light;
     padding-left: $spacing-unit / 2;
-    font-size: 18px;
-    letter-spacing: -1px;
-    font-style: italic;
 
     > :last-child {
         margin-bottom: 0;
@@ -141,6 +136,7 @@ pre {
     overflow-x: scroll;
 
     > code {
+        background: transparent;
         border: 0;
         padding-right: 0;
         padding-left: 0;

diff --git a/_sass/_layout.scss b/_sass/_layout.scss
@@ -17,9 +17,8 @@
 }
 
 .site-title {
-    font-size: 26px;
-    line-height: 56px;
-    letter-spacing: -1px;
+    font-size: 150%;
+    line-height: 4rem;
     margin-bottom: 0;
     float: left;
 
@@ -31,15 +30,14 @@
 
 .site-nav {
     float: right;
-    line-height: 56px;
+    line-height: 4rem;
 
     .menu-icon {
         display: none;
     }
 
     .page-link {
         color: $text-color;
-        line-height: $base-line-height;
 
         // Gaps between nav items, but not on the first one
         &:not(:first-child) {
@@ -210,9 +208,7 @@
 }
 
 .post-title {
-    font-size: 42px;
-    letter-spacing: -1px;
-    line-height: 1;
+    font-size: 200%;
 
     @include media-query($on-laptop) {
         font-size: 36px;

diff --git a/css/main.scss b/css/main.scss
@@ -6,18 +6,16 @@
 
 
 // Our variables
-$base-font-family: Helvetica, Arial, sans-serif;
-$base-font-size:   16px;
-$small-font-size:  $base-font-size * 0.875;
-$base-line-height: 1.5;
+$base-font-family: sans-serif;
+$small-font-size:  87.5%;
 
 $spacing-unit:     30px;
 
 $text-color:       #111;
 $background-color: #fdfdfd;
 $brand-color:      #2a7ae2;
 
-$grey-color:       #828282;
+$grey-color:       #626262;
 $grey-color-light: lighten($grey-color, 40%);
 $grey-color-dark:  darken($grey-color, 25%);