Add fonts asynchronousy and add all css inline

This commit is contained in:
Alexis Tacnet
2017-04-18 22:19:32 +02:00
parent 7726b3d5f7
commit faa591e120
8 changed files with 62 additions and 21 deletions

View File

@@ -1,6 +1,6 @@
@font-face { @font-face {
font-family: 'Nexa Bold'; font-family: 'Nexa Bold';
src: url('../fonts/Nexa Bold.otf'); src: url('/fonts/Nexa Bold.otf');
} }
html, body, div, span, applet, object, iframe, html, body, div, span, applet, object, iframe,
@@ -82,8 +82,8 @@ body {
justify-content: flex-start; justify-content: flex-start;
width: 100%; width: 100%;
min-height: 100%; min-height: 100%;
font-weight: 500; font-weight: 400;
font-family: 'Raleway', 'Helvetica Neue', 'Arial', sans-serif; font-family: 'Helvetica Neue', 'Arial', sans-serif;
color: #111111; color: #111111;
line-height: 1.6; line-height: 1.6;
text-rendering: optimizeLegibility !important; text-rendering: optimizeLegibility !important;
@@ -180,10 +180,10 @@ section.header nav ul a:last-child {
} }
section.header nav ul li { section.header nav ul li {
color: #555555; color: #555555;
font-weight: 500; font-weight: 400;
font-size: 14px; font-size: 14px;
text-transform: uppercase; text-transform: uppercase;
font-family: 'Raleway', 'Helvetica Neue', 'Arial', sans-serif; font-family: 'Helvetica Neue', 'Arial', sans-serif;
-webkit-transition: color 0.1s cubic-bezier(0.47, 0, 0.75, 0.72); -webkit-transition: color 0.1s cubic-bezier(0.47, 0, 0.75, 0.72);
-moz-transition: color 0.1s cubic-bezier(0.47, 0, 0.75, 0.72); -moz-transition: color 0.1s cubic-bezier(0.47, 0, 0.75, 0.72);
-ms-transition: color 0.1s cubic-bezier(0.47, 0, 0.75, 0.72); -ms-transition: color 0.1s cubic-bezier(0.47, 0, 0.75, 0.72);
@@ -266,10 +266,10 @@ section.main .content .posts {
} }
section.main .content .page-heading { section.main .content .page-heading {
font-size: 20px; font-size: 20px;
font-family: 'Raleway', 'Helvetica Neue', 'Arial', sans-serif; font-weight: 700;
font-family: 'Helvetica Neue', 'Arial', sans-serif;
letter-spacing: -0.005rem; letter-spacing: -0.005rem;
text-transform: uppercase; text-transform: uppercase;
font-weight: 700;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
font-smoothing: antialiased; font-smoothing: antialiased;
@@ -355,8 +355,8 @@ section.main .container.f04 .content {
} }
section.main .container.f04 .content .num { section.main .container.f04 .content .num {
margin: 30px 0px 30px 0; margin: 30px 0px 30px 0;
font-weight: 200; font-weight: 400;
font-family: 'Raleway', 'Helvetica Neue', 'Arial', sans-serif; font-family: 'Helvetica Neue', 'Arial', sans-serif;
font-size: 50px; font-size: 50px;
} }
section.main .container.f04 .content .detail { section.main .container.f04 .content .detail {
@@ -434,7 +434,7 @@ section.main .content .markdown {
font-size: 1.1em; font-size: 1.1em;
line-height: 1.75em; line-height: 1.75em;
color: #313537; color: #313537;
font-family: 'Merriweather', sans-serif; font-family: serif;
font-weight: 300; font-weight: 300;
} }
section.main .content .markdown h1, section.main .content .markdown h1,
@@ -444,7 +444,7 @@ section.main .content .markdown h4,
section.main .content .markdown h5, section.main .content .markdown h5,
section.main .content .markdown h6 { section.main .content .markdown h6 {
font-size: 22px; font-size: 22px;
font-family: 'Raleway', 'Helvetica Neue', 'Arial', sans-serif; font-family: 'Helvetica Neue', 'Arial', sans-serif;
letter-spacing: -0.005rem; letter-spacing: -0.005rem;
font-weight: 700; font-weight: 700;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
@@ -475,7 +475,7 @@ section.main .content .markdown h6 {
} }
section.main .content .markdown code, section.main .content .markdown code,
section.main .content .markdown pre { section.main .content .markdown pre {
font-family: 'Ubuntu Mono', 'Menlo', monospace; font-family: 'Menlo', monospace;
font-size: 0.98rem; font-size: 0.98rem;
background-color: #f7f7f7; background-color: #f7f7f7;
} }
@@ -652,4 +652,28 @@ section.main .content .navigation a {
text-align: center; text-align: center;
font-style: italic; font-style: italic;
color: #313537; color: #313537;
}
/* Fonts */
.wf-raleway-n4-active body,
.wf-raleway-n4-active section.header nav ul li,
.wf-raleway-n7-active section.main .content .page-heading,
.wf-raleway-n2-active section.main .container.f04 .content .num,
.wf-raleway-n7-active section.main .content .markdown h1,
.wf-raleway-n7-active section.main .content .markdown h2,
.wf-raleway-n7-active section.main .content .markdown h3,
.wf-raleway-n7-active section.main .content .markdown h4,
.wf-raleway-n7-active section.main .content .markdown h5,
.wf-raleway-n7-active section.main .content .markdown h6 {
font-family: 'Raleway';
}
.wf-merriweather-n3-active section.main .content .markdown {
font-family: 'Merriweather';
}
.wf-ubuntu-mono-n4-active section.main .content .markdown code,
.wf-ubuntu-mono-n4-active section.main .content .markdown pre {
font-family: 'Ubuntu Mono';
} }

View File

@@ -1,3 +1,12 @@
<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>
{{ if .Site.Params.highlightjs }} {{ if .Site.Params.highlightjs }}
<script src="{{ .Site.BaseURL }}js/highlight.min.js" defer></script> <script src="{{ .Site.BaseURL }}js/highlight.min.js" defer></script>
{{ range .Site.Params.highlightjslanguages }} {{ range .Site.Params.highlightjslanguages }}

View File

@@ -1,28 +1,36 @@
<!-- CSS --> <!-- CSS -->
<link href="https://fonts.googleapis.com/css?family=Raleway:400,600,700" rel="stylesheet"> <style media="screen">
<link href="https://fonts.googleapis.com/css?family=Merriweather:300,300i,700,700i" rel="stylesheet"> {{ partial "css/main.css" . | safeCSS }}
<link href="https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700" rel="stylesheet"> </style>
<style media="(min-width: 600px)">
{{ partial "css/min600px.css" . | safeCSS }}
</style>
<style media="(min-width: 769px)">
{{ partial "css/min769px.css" . | safeCSS }}
</style>
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/main.v1.0.0.css" media="screen"> <noscript>
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/min600px.v1.0.0.css" media="(min-width: 600px)"> <link href="https://fonts.googleapis.com/css?family=Raleway:400,600,700" rel="stylesheet">
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/min769px.v1.0.0.css" media="(min-width: 769px)"> <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>
{{ if .Site.Params.highlightjs }} {{ if .Site.Params.highlightjs }}
<style type="text/css" media="screen"> <style type="text/css" media="screen">
{{ partial "highlight.min.css" . | safeCSS }} {{ partial "css/highlight.min.css" . | safeCSS }}
</style> </style>
{{ end }} {{ end }}
{{ if .Site.Params.progressively }} {{ if .Site.Params.progressively }}
<style type="text/css" media="screen"> <style type="text/css" media="screen">
{{ partial "progressively.min.css" . | safeCSS }} {{ partial "css/progressively.min.css" . | safeCSS }}
</style> </style>
{{ end }} {{ end }}
{{ if .Site.Params.colors }} {{ if .Site.Params.colors }}
<style type="text/css" media="screen"> <style type="text/css" media="screen">
{{ partial "colors.css" . | safeCSS }} {{ partial "css/colors.css" . | safeCSS }}
</style> </style>
{{ end }} {{ end }}