Skip to content
This repository has been archived by the owner on Dec 30, 2022. It is now read-only.

Eliminate font flickering #137

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions layouts/partials/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -748,25 +748,25 @@ kbd {
/* 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';
}
{{ end }}
11 changes: 0 additions & 11 deletions layouts/partials/footer_scripts.html
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/head_includes.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
{{ partial "css/min769px.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">
Expand Down