From 368d6041aeac6e518ba0026a762ed15e8e41d342 Mon Sep 17 00:00:00 2001
From: Elliot Jordan <homebysix@users.noreply.github.com>
Date: Tue, 5 Oct 2021 10:03:51 -0700
Subject: [PATCH] Eliminate font flickering

From: https://github.com/mtn/cocoa-eh-hugo-theme/pull/137

Was simpler to reapply changes rather than rebase.
---
 layouts/partials/css/main.css        | 26 +++++++++++++-------------
 layouts/partials/footer_scripts.html | 11 -----------
 layouts/partials/head_includes.html  |  4 ++--
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/layouts/partials/css/main.css b/layouts/partials/css/main.css
index a41fea7d..0996cc9e 100644
--- a/layouts/partials/css/main.css
+++ b/layouts/partials/css/main.css
@@ -885,25 +885,25 @@ span.draftlabel {
 
 /* Fonts */
 {{ if not .Site.Params.disablefancyfonts }}
-.wf-raleway-n4-active body,
-.wf-raleway-n4-active div.header nav ul a,
-.wf-raleway-n7-active div.main .content .page-heading,
-.wf-raleway-n2-active div.main .container.f04 .content .num,
-.wf-raleway-n7-active div.main .content .markdown h1,
-.wf-raleway-n7-active div.main .content .markdown h2,
-.wf-raleway-n7-active div.main .content .markdown h3,
-.wf-raleway-n7-active div.main .content .markdown h4,
-.wf-raleway-n7-active div.main .content .markdown h5,
-.wf-raleway-n7-active div.main .content .markdown h6 {
+body,
+div.header nav ul a,
+div.main .content .page-heading,
+div.main .container.f04 .content .num,
+div.main .content .markdown h1,
+div.main .content .markdown h2,
+div.main .content .markdown h3,
+div.main .content .markdown h4,
+div.main .content .markdown h5,
+div.main .content .markdown h6 {
     font-family: 'Raleway';
 }
 
-.wf-merriweather-n3-active div.main .content .markdown {
+div.main .content .markdown {
     font-family: 'Merriweather';
 }
 
-.wf-ubuntu-mono-n4-active div.main .content .markdown code,
-.wf-ubuntu-mono-n4-active div.main .content .markdown pre {
+div.main .content .markdown code,
+div.main .content .markdown pre {
     font-family: 'Ubuntu Mono';
 }
 
diff --git a/layouts/partials/footer_scripts.html b/layouts/partials/footer_scripts.html
index 54dced01..54c47b0a 100644
--- a/layouts/partials/footer_scripts.html
+++ b/layouts/partials/footer_scripts.html
@@ -1,14 +1,3 @@
-{{ if not .Site.Params.disablefancyfonts }}
-<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js"></script>
-<script>
-  WebFont.load({
-    google: {
-      families: ['Raleway:400,600,700', 'Merriweather:300,300i,700,700i', 'Ubuntu+Mono:400,700']
-    }
-  });
-</script>
-{{ end }}
-
 {{ if .Site.Params.highlightjs }}
   <script src="{{ .Site.BaseURL }}js/highlight.min.js" defer></script>
   {{ range .Site.Params.highlightjslanguages }}
diff --git a/layouts/partials/head_includes.html b/layouts/partials/head_includes.html
index cdbc0427..56832314 100644
--- a/layouts/partials/head_includes.html
+++ b/layouts/partials/head_includes.html
@@ -10,11 +10,11 @@
   {{ partial "css/max600px.css" . | safeCSS }}
 </style>
 
-<noscript>
+{{ if not .Site.Params.disablefancyfonts  }}
   <link href="https://fonts.googleapis.com/css?family=Raleway:400,600,700" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Merriweather:300,300i,700,700i" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700" rel="stylesheet">
-</noscript>
+{{ end  }}
 {{ if .Site.Params.highlightjs }}
   <style type="text/css" media="screen">
     {{ partial "css/highlight.min.css" . | safeCSS }}