From 91b13393110c9ccbd5652b2442117746a41e0c2a Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Mon, 16 Jan 2017 17:22:51 +0000
Subject: [PATCH] Switch to Hoefler & Co fonts

---
 _assets/stylesheets/includes/styles.css.scss  |  4 ++--
 .../stylesheets/includes/typography.css.scss  | 19 +++++++++----------
 _assets/stylesheets/parts/footer.css.scss     |  2 +-
 _assets/stylesheets/parts/post.css.scss       |  3 ++-
 _includes/head.html                           |  3 +--
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/_assets/stylesheets/includes/styles.css.scss b/_assets/stylesheets/includes/styles.css.scss
index a1bcc5e..95834f1 100644
--- a/_assets/stylesheets/includes/styles.css.scss
+++ b/_assets/stylesheets/includes/styles.css.scss
@@ -15,7 +15,7 @@ body > header {
   h1 a {
     //display: inline-block
     margin-top: 0;
-    font-weight: 700;
+    font-weight: 600;
     //line-height: 0
   }
 }
@@ -60,7 +60,7 @@ article > header {
 }
 
 article > header h1, #content .blog-index article h1 {
-  font-size: 1.5em;
+  font-size: 1.35em;
 }
 
 body > nav {
diff --git a/_assets/stylesheets/includes/typography.css.scss b/_assets/stylesheets/includes/typography.css.scss
index d4fd73e..0023434 100644
--- a/_assets/stylesheets/includes/typography.css.scss
+++ b/_assets/stylesheets/includes/typography.css.scss
@@ -1,8 +1,7 @@
 // $blockquote: $type-border !default
-$sans: "adelle", sans-serif !default;
-$serif: "rooney-web", Georgia, Times, "Times New Roman", serif !default;
+$heading-font-family: "Sentinel SSm A", "Sentinel SSm B", Georgia, Times, "Times New Roman", serif;
+$body-font-family: "Sentinel SSm A", "Sentinel SSm B", Georgia, Times, "Times New Roman", serif;
 $mono: "source-code-pro", monospace !default;
-$heading-font-family: "adelle", sans-serif !default;
 $header-title-font-family: $heading-font-family !default;
 $header-subtitle-font-family: $heading-font-family !default;
 
@@ -16,7 +15,7 @@ $header-subtitle-font-family: $heading-font-family !default;
 
 /*Pick Your Fonts */
 body, h5, h6, .run-in, dt {
-  font-family: $serif;
+  font-family: $body-font-family;
 }
 
 h1, h2, h3, h4, .pullquote, .sidenote h1, aside h1, .pullquote, .drop-cap, cite {
@@ -25,13 +24,13 @@ h1, h2, h3, h4, .pullquote, .sidenote h1, aside h1, .pullquote, .drop-cap, cite
 
 /*Nav Fonts */
 nav[role=navigation] {
-  font-family: $sans;
+  font-family: $heading-font-family;
 }
 
 /*Size & Vertical Rhythm */
 body {
   font-size: 100%;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 1.5em;
 }
 
@@ -48,7 +47,7 @@ h1 {
 }
 
 h2 {
-  font-size: 1.75em;
+  font-size: 1.5em;
   line-height: 1.1em;
   margin: 2em 0 0.5em;
 }
@@ -66,12 +65,12 @@ h4 {
 }
 
 h1, h2, h3 {
-  font-weight: 500;
+  font-weight: 600;
   text-rendering: optimizelegibility;
 }
 
 h4, h5, h6 {
-  font-weight: 700;
+  font-weight: 600;
   text-rendering: optimizelegibility;
 }
 
@@ -80,7 +79,7 @@ article h1 {
 }
 
 strong {
-  font-weight: 700;
+  font-weight: 600;
 }
 
 small {
diff --git a/_assets/stylesheets/parts/footer.css.scss b/_assets/stylesheets/parts/footer.css.scss
index ebb067d..da9538a 100644
--- a/_assets/stylesheets/parts/footer.css.scss
+++ b/_assets/stylesheets/parts/footer.css.scss
@@ -34,7 +34,7 @@ body > footer {
         color: #999 #bbb #bbb #999;
       };
       color: $text-color;
-      font-family: $serif;
+      font-family: $body-font-family;
       font-size: 1em;
       padding: 0.15em 0.75em;
       &:focus {
diff --git a/_assets/stylesheets/parts/post.css.scss b/_assets/stylesheets/parts/post.css.scss
index d0ac4e4..b598203 100644
--- a/_assets/stylesheets/parts/post.css.scss
+++ b/_assets/stylesheets/parts/post.css.scss
@@ -11,7 +11,7 @@ article {
       text-rendering: optimizelegibility;
     }
     h1 + .meta {
-      margin-top: -2.5rem;
+      margin-top: -2.25rem;
     }
   }
   header a {
@@ -41,6 +41,7 @@ article {
   > footer {
     padding-left: 0;
     padding-right: 0;
+    margin-top: 2em;
     p.meta {
       margin-bottom: 0.8em;
       font-size: 0.85em;
diff --git a/_includes/head.html b/_includes/head.html
index 8254b61..bc4ae24 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -37,8 +37,7 @@
 <!-- Safari pinned tab -->
 <link rel="mask-icon" href="{{ 'favicon.svg' | asset_path }}" color="#4B8400">
 
-<script type="text/javascript" src="//use.typekit.com/ori1zzm.js"></script>
-<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+<link rel="stylesheet" type="text/css" href="https://cloud.typography.com/7434852/6285372/css/fonts.css" />
 
 <meta property="og:title" content="{{ page.title }}">
 <meta property="og:url" content="{{ site.url }}{{ page.url }}">