Various changes to improve local loading of Oxygen.

23 files changed, 25 insertions, 30 deletions

diff --git a/assets/_fonts.scss b/assets/_fonts.scss
index 549fddc..17cd664 100644
--- a/assets/_fonts.scss
+++ b/assets/_fonts.scss
@@ -3,50 +3,50 @@
   font-family: 'Oxygen';
   font-style: normal;
   font-weight: 300;
-  src: url('oxygen-v8-latin-300.eot'); /* IE9 Compat Modes */
+  src: url('/fonts/oxygen-v8-latin-300.eot'); /* IE9 Compat Modes */
   src: local('Oxygen Light'), local('Oxygen-Light'),
-       url('oxygen-v8-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('oxygen-v8-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
-       url('oxygen-v8-latin-300.woff') format('woff'), /* Modern Browsers */
-       url('oxygen-v8-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('oxygen-v8-latin-300.svg#Oxygen') format('svg'); /* Legacy iOS */
+       url('/fonts/oxygen-v8-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/fonts/oxygen-v8-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
+       url('/fonts/oxygen-v8-latin-300.woff') format('woff'), /* Modern Browsers */
+       url('/fonts/oxygen-v8-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('/fonts/oxygen-v8-latin-300.svg#Oxygen') format('svg'); /* Legacy iOS */
 }
 /* oxygen-regular - latin */
 @font-face {
   font-family: 'Oxygen';
   font-style: normal;
   font-weight: 400;
-  src: url('oxygen-v8-latin-regular.eot'); /* IE9 Compat Modes */
+  src: url('/fonts/oxygen-v8-latin-regular.eot'); /* IE9 Compat Modes */
   src: local('Oxygen Regular'), local('Oxygen-Regular'),
-       url('oxygen-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('oxygen-v8-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('oxygen-v8-latin-regular.woff') format('woff'), /* Modern Browsers */
-       url('oxygen-v8-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('oxygen-v8-latin-regular.svg#Oxygen') format('svg'); /* Legacy iOS */
+       url('/fonts/oxygen-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/fonts/oxygen-v8-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('/fonts/oxygen-v8-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('/fonts/oxygen-v8-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('/fonts/oxygen-v8-latin-regular.svg#Oxygen') format('svg'); /* Legacy iOS */
 }
 /* oxygen-700 - latin */
 @font-face {
   font-family: 'Oxygen';
   font-style: normal;
   font-weight: 700;
-  src: url('oxygen-v8-latin-700.eot'); /* IE9 Compat Modes */
+  src: url('/fonts/oxygen-v8-latin-700.eot'); /* IE9 Compat Modes */
   src: local('Oxygen Bold'), local('Oxygen-Bold'),
-       url('oxygen-v8-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('oxygen-v8-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-       url('oxygen-v8-latin-700.woff') format('woff'), /* Modern Browsers */
-       url('oxygen-v8-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('oxygen-v8-latin-700.svg#Oxygen') format('svg'); /* Legacy iOS */
+       url('/fonts/oxygen-v8-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/fonts/oxygen-v8-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+       url('/fonts/oxygen-v8-latin-700.woff') format('woff'), /* Modern Browsers */
+       url('/fonts/oxygen-v8-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('/fonts/oxygen-v8-latin-700.svg#Oxygen') format('svg'); /* Legacy iOS */
 }
 /* oxygen-mono-regular - latin */
 @font-face {
   font-family: 'Oxygen Mono';
   font-style: normal;
   font-weight: 400;
-  src: url('oxygen-mono-v6-latin-regular.eot'); /* IE9 Compat Modes */
+  src: url('/fonts/oxygen-mono-v6-latin-regular.eot'); /* IE9 Compat Modes */
   src: local('Oxygen Mono'), local('OxygenMono-Regular'),
-       url('oxygen-mono-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('oxygen-mono-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('oxygen-mono-v6-latin-regular.woff') format('woff'), /* Modern Browsers */
-       url('oxygen-mono-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('oxygen-mono-v6-latin-regular.svg#OxygenMono') format('svg'); /* Legacy iOS */
+       url('/fonts/oxygen-mono-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/fonts/oxygen-mono-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('/fonts/oxygen-mono-v6-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('/fonts/oxygen-mono-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('/fonts/oxygen-mono-v6-latin-regular.svg#OxygenMono') format('svg'); /* Legacy iOS */
 }
diff --git a/assets/book.scss b/assets/book.scss
index 64cf13d..d0d8c19 100644
--- a/assets/book.scss
+++ b/assets/book.scss
@@ -2,6 +2,7 @@
 @import "variables";
 @import "markdown";
 @import "utils";
+@import "fonts";
 
 html {
   font-size: $font-size-base;
diff --git a/layouts/partials/docs/html-head.html b/layouts/partials/docs/html-head.html
index 35d0e81..5fbc549 100644
--- a/layouts/partials/docs/html-head.html
+++ b/layouts/partials/docs/html-head.html
@@ -2,12 +2,6 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>{{- template "title" . }} | {{ .Site.Title -}}</title>
 
-<!-- Fonts for the theme -->
-{{ if default true .Site.Params.googleFonts }}
-	{{ $fonts := resources.Get "_fonts.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
-	<link rel="stylesheet" href="{{ $fonts.RelPermalink }}">
-{{ end }}
-
 <!-- Theme stylesheet, you can customize scss by creatig `assets/custom.scss` in your website -->
 {{ $styles := resources.Get "book.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
 <link rel="stylesheet" href="{{ $styles.RelPermalink }}">
diff --git a/static/oxygen-mono-v6-latin-regular.eot b/static/fonts/oxygen-mono-v6-latin-regular.eot
index 722fa29..722fa29 100644
--- a/static/oxygen-mono-v6-latin-regular.eot
+++ b/static/fonts/oxygen-mono-v6-latin-regular.eot
diff --git a/static/oxygen-mono-v6-latin-regular.svg b/static/fonts/oxygen-mono-v6-latin-regular.svg
index 5f5d26f..5f5d26f 100644
--- a/static/oxygen-mono-v6-latin-regular.svg
+++ b/static/fonts/oxygen-mono-v6-latin-regular.svg
diff --git a/static/oxygen-mono-v6-latin-regular.ttf b/static/fonts/oxygen-mono-v6-latin-regular.ttf
index ac38dfc..ac38dfc 100644
--- a/static/oxygen-mono-v6-latin-regular.ttf
+++ b/static/fonts/oxygen-mono-v6-latin-regular.ttf
diff --git a/static/oxygen-mono-v6-latin-regular.woff b/static/fonts/oxygen-mono-v6-latin-regular.woff
index a020f95..a020f95 100644
--- a/static/oxygen-mono-v6-latin-regular.woff
+++ b/static/fonts/oxygen-mono-v6-latin-regular.woff
diff --git a/static/oxygen-mono-v6-latin-regular.woff2 b/static/fonts/oxygen-mono-v6-latin-regular.woff2
index 57ea1a2..57ea1a2 100644
--- a/static/oxygen-mono-v6-latin-regular.woff2
+++ b/static/fonts/oxygen-mono-v6-latin-regular.woff2
diff --git a/static/oxygen-v8-latin-300.eot b/static/fonts/oxygen-v8-latin-300.eot
index 8fc445b..8fc445b 100644
--- a/static/oxygen-v8-latin-300.eot
+++ b/static/fonts/oxygen-v8-latin-300.eot
diff --git a/static/oxygen-v8-latin-300.svg b/static/fonts/oxygen-v8-latin-300.svg
index b47a28e..b47a28e 100644
--- a/static/oxygen-v8-latin-300.svg
+++ b/static/fonts/oxygen-v8-latin-300.svg
diff --git a/static/oxygen-v8-latin-300.ttf b/static/fonts/oxygen-v8-latin-300.ttf
index a6daa86..a6daa86 100644
--- a/static/oxygen-v8-latin-300.ttf
+++ b/static/fonts/oxygen-v8-latin-300.ttf
diff --git a/static/oxygen-v8-latin-300.woff b/static/fonts/oxygen-v8-latin-300.woff
index 7d67e38..7d67e38 100644
--- a/static/oxygen-v8-latin-300.woff
+++ b/static/fonts/oxygen-v8-latin-300.woff
diff --git a/static/oxygen-v8-latin-300.woff2 b/static/fonts/oxygen-v8-latin-300.woff2
index 7e4c2d8..7e4c2d8 100644
--- a/static/oxygen-v8-latin-300.woff2
+++ b/static/fonts/oxygen-v8-latin-300.woff2
diff --git a/static/oxygen-v8-latin-700.eot b/static/fonts/oxygen-v8-latin-700.eot
index e9ee2bd..e9ee2bd 100644
--- a/static/oxygen-v8-latin-700.eot
+++ b/static/fonts/oxygen-v8-latin-700.eot
diff --git a/static/oxygen-v8-latin-700.svg b/static/fonts/oxygen-v8-latin-700.svg
index dffbcc9..dffbcc9 100644
--- a/static/oxygen-v8-latin-700.svg
+++ b/static/fonts/oxygen-v8-latin-700.svg
diff --git a/static/oxygen-v8-latin-700.ttf b/static/fonts/oxygen-v8-latin-700.ttf
index fcefd3b..fcefd3b 100644
--- a/static/oxygen-v8-latin-700.ttf
+++ b/static/fonts/oxygen-v8-latin-700.ttf
diff --git a/static/oxygen-v8-latin-700.woff b/static/fonts/oxygen-v8-latin-700.woff
index b53f41e..b53f41e 100644
--- a/static/oxygen-v8-latin-700.woff
+++ b/static/fonts/oxygen-v8-latin-700.woff
diff --git a/static/oxygen-v8-latin-700.woff2 b/static/fonts/oxygen-v8-latin-700.woff2
index efc1156..efc1156 100644
--- a/static/oxygen-v8-latin-700.woff2
+++ b/static/fonts/oxygen-v8-latin-700.woff2
diff --git a/static/oxygen-v8-latin-regular.eot b/static/fonts/oxygen-v8-latin-regular.eot
index ddb8989..ddb8989 100644
--- a/static/oxygen-v8-latin-regular.eot
+++ b/static/fonts/oxygen-v8-latin-regular.eot
diff --git a/static/oxygen-v8-latin-regular.svg b/static/fonts/oxygen-v8-latin-regular.svg
index 08201da..08201da 100644
--- a/static/oxygen-v8-latin-regular.svg
+++ b/static/fonts/oxygen-v8-latin-regular.svg
diff --git a/static/oxygen-v8-latin-regular.ttf b/static/fonts/oxygen-v8-latin-regular.ttf
index add0adb..add0adb 100644
--- a/static/oxygen-v8-latin-regular.ttf
+++ b/static/fonts/oxygen-v8-latin-regular.ttf
diff --git a/static/oxygen-v8-latin-regular.woff b/static/fonts/oxygen-v8-latin-regular.woff
index d324505..d324505 100644
--- a/static/oxygen-v8-latin-regular.woff
+++ b/static/fonts/oxygen-v8-latin-regular.woff
diff --git a/static/oxygen-v8-latin-regular.woff2 b/static/fonts/oxygen-v8-latin-regular.woff2
index 22be243..22be243 100644
--- a/static/oxygen-v8-latin-regular.woff2
+++ b/static/fonts/oxygen-v8-latin-regular.woff2