Add fonts locally instead of with Google Fonts (#58)

nielsenramon · Mar 2, 2017 · 6c144d7 · 6c144d7
1 parent 542ecc7
commit 6c144d7
Show file tree

Hide file tree

Showing 26 changed files with 1,865 additions and 18 deletions.
diff --git a/404.html b/404.html
@@ -26,14 +26,5 @@ <h1><a href="{{ '/' | relative_url }}" title="Back to homepage">{{ site.name }}<
       </p>
     </div>
   </main>
-
-  <script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.16/webfont.js"></script>
-  <script>
-    WebFont.load({
-      google: {
-        families: ['Cormorant Garamond:700', 'Lato:300,400,700']
-      }
-    });
-  </script>
 </body>
 </html>
diff --git a/_assets/fonts/Cormorant-Garamond-500.eot b/_assets/fonts/Cormorant-Garamond-500.eot
diff --git a/_assets/fonts/Cormorant-Garamond-500.svg b/_assets/fonts/Cormorant-Garamond-500.svg
diff --git a/_assets/fonts/Cormorant-Garamond-500.ttf b/_assets/fonts/Cormorant-Garamond-500.ttf
diff --git a/_assets/fonts/Cormorant-Garamond-500.woff b/_assets/fonts/Cormorant-Garamond-500.woff
diff --git a/_assets/fonts/Cormorant-Garamond-500.woff2 b/_assets/fonts/Cormorant-Garamond-500.woff2
diff --git a/_assets/fonts/Lato-300.eot b/_assets/fonts/Lato-300.eot
diff --git a/_assets/fonts/Lato-300.svg b/_assets/fonts/Lato-300.svg
diff --git a/_assets/fonts/Lato-300.ttf b/_assets/fonts/Lato-300.ttf
diff --git a/_assets/fonts/Lato-300.woff b/_assets/fonts/Lato-300.woff
diff --git a/_assets/fonts/Lato-300.woff2 b/_assets/fonts/Lato-300.woff2
diff --git a/_assets/fonts/Lato-700.eot b/_assets/fonts/Lato-700.eot
diff --git a/_assets/fonts/Lato-700.svg b/_assets/fonts/Lato-700.svg
diff --git a/_assets/fonts/Lato-700.ttf b/_assets/fonts/Lato-700.ttf
diff --git a/_assets/fonts/Lato-700.woff b/_assets/fonts/Lato-700.woff
diff --git a/_assets/fonts/Lato-700.woff2 b/_assets/fonts/Lato-700.woff2
diff --git a/_assets/fonts/Lato-regular.eot b/_assets/fonts/Lato-regular.eot
diff --git a/_assets/fonts/Lato-regular.svg b/_assets/fonts/Lato-regular.svg
diff --git a/_assets/fonts/Lato-regular.ttf b/_assets/fonts/Lato-regular.ttf
diff --git a/_assets/fonts/Lato-regular.woff b/_assets/fonts/Lato-regular.woff
diff --git a/_assets/fonts/Lato-regular.woff2 b/_assets/fonts/Lato-regular.woff2
diff --git a/_assets/stylesheets/dark.scss b/_assets/stylesheets/dark.scss
@@ -68,3 +68,4 @@ $article-paginator-color-hover: $gray-lightest;
 @import "modules/header";
 @import "modules/highlights-dark";
 @import "modules/icons";
+@import "modules/fonts";
diff --git a/_assets/stylesheets/light.scss b/_assets/stylesheets/light.scss
@@ -68,3 +68,4 @@ $article-paginator-color-hover: $gray-darkest;
 @import "modules/header";
 @import "modules/highlights-light";
 @import "modules/icons";
+@import "modules/fonts";
diff --git a/_assets/stylesheets/modules/_fonts.scss b/_assets/stylesheets/modules/_fonts.scss
@@ -0,0 +1,59 @@
+@charset "UTF-8";
+
+/* Cormorant Garamond */
+@font-face {
+font-family: 'Cormorant Garamond';
+font-weight: 500;
+font-style: normal;
+src: url(asset_path('Cormorant-Garamond-500.eot'));
+src: url(asset_path('Cormorant-Garamond-500.eot?#iefix')) format('embedded-opentype'),
+local('Cormorant Garamond Medium'),
+local('Cormorant-Garamond-500'),
+url(asset_path('Cormorant-Garamond-500.woff2')) format('woff2'),
+url(asset_path('Cormorant-Garamond-500.woff')) format('woff'),
+url(asset_path('Cormorant-Garamond-500.ttf')) format('truetype'),
+url(asset_path('Cormorant-Garamond-500.svg#CormorantGaramond')) format('svg');
+}
+
+/*Lato*/
+@font-face {
+font-family: 'Lato';
+font-weight: 300;
+font-style: normal;
+src: url(asset_path('Lato-300.eot'));
+src: url(asset_path('Lato-300.eot?#iefix')) format('embedded-opentype'),
+local('Lato Light'),
+local('Lato-300'),
+url(asset_path('Lato-300.woff2')) format('woff2'),
+url(asset_path('Lato-300.woff')) format('woff'),
+url(asset_path('Lato-300.ttf')) format('truetype'),
+url(asset_path('Lato-300.svg#Lato')) format('svg');
+}
+
+@font-face {
+font-family: 'Lato';
+font-weight: 400;
+font-style: normal;
+src: url(asset_path('Lato-regular.eot'));
+src: url(asset_path('Lato-regular.eot?#iefix')) format('embedded-opentype'),
+local('Lato Regular'),
+local('Lato-regular'),
+url(asset_path('Lato-regular.woff2')) format('woff2'),
+url(asset_path('Lato-regular.woff')) format('woff'),
+url(asset_path('Lato-regular.ttf')) format('truetype'),
+url(asset_path('Lato-regular.svg#Lato')) format('svg');
+}
+
+@font-face {
+font-family: 'Lato';
+font-weight: 700;
+font-style: normal;
+src: url(asset_path('Lato-700.eot'));
+src: url(asset_path('Lato-700.eot?#iefix')) format('embedded-opentype'),
+local('Lato Bold'),
+local('Lato-700'),
+url(asset_path('Lato-700.woff2')) format('woff2'),
+url(asset_path('Lato-700.woff')) format('woff'),
+url(asset_path('Lato-700.ttf')) format('truetype'),
+url(asset_path('Lato-700.svg#Lato')) format('svg');
+}
diff --git a/_config.yml b/_config.yml
diff --git a/_includes/javascripts.html b/_includes/javascripts.html
@@ -1,12 +1,3 @@
-<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.16/webfont.js"></script>
-<script>
-  WebFont.load({
-    google: {
-      families: ['Cormorant Garamond:700', 'Lato:300,400,700']
-    }
-  });
-</script>
-
 {% if site.ga_analytics %}
   <script>
     window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;