Merge branch '48_import-custom-css' into development

3 files changed, 73 insertions, 73 deletions

diff --git a/layouts/partials/fonts.css b/layouts/partials/fonts.css
deleted file mode 100644
index a3d857c..0000000
--- a/layouts/partials/fonts.css
+++ /dev/null
@@ -1,72 +0,0 @@
-@font-face{
-    font-family: 'Fira Code';
-    src: url('{{ .Site.BaseURL }}fonts/FiraCode-Regular.eot');
-    src: url('{{ .Site.BaseURL }}fonts/FiraCode-Regular.eot?#iefix') format('embedded-opentype'),
-         url('{{ .Site.BaseURL }}fonts/FiraCode-Regular.woff2') format('woff2'),
-         url('{{ .Site.BaseURL }}fonts/FiraCode-Regular.woff') format('woff'),
-         url('{{ .Site.BaseURL }}fonts/FiraCode-Regular.ttf') format('truetype');
-    font-weight: 400;
-    font-style: normal;
-    font-display: fallback;
-}
-
-@font-face {
-    font-family: 'Charter';
-    src: url('{{ .Site.BaseURL }}fonts/charter_regular-webfont.eot');
-    src: url('{{ .Site.BaseURL }}fonts/charter_regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('{{ .Site.BaseURL }}fonts/charter_regular-webfont.woff') format('woff'),
-         url('{{ .Site.BaseURL }}fonts/charter_regular-webfont.ttf') format('truetype');
-    font-display: fallback;
-}
-
-@font-face {
-    font-family: 'Charter';
-    src: url('{{ .Site.BaseURL }}fonts/charter_bold-webfont.eot');
-    src: url('{{ .Site.BaseURL }}fonts/charter_bold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('{{ .Site.BaseURL }}fonts/charter_bold-webfont.woff') format('woff'),
-         url('{{ .Site.BaseURL }}fonts/charter_bold-webfont.ttf') format('truetype');
-    font-weight: bold;
-    font-display: fallback;
-}
-
-@font-face {
-    font-family: 'Charter';
-    src: url('{{ .Site.BaseURL }}fonts/charter_italic-webfont.eot');
-    src: url('{{ .Site.BaseURL }}fonts/charter_italic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('{{ .Site.BaseURL }}fonts/charter_italic-webfont.woff') format('woff'),
-         url('{{ .Site.BaseURL }}fonts/charter_italic-webfont.ttf') format('truetype');
-    font-style: italic;
-    font-display: fallback;
-}
-
-@font-face {
-    font-family: 'Charter';
-    src: url('{{ .Site.BaseURL }}fonts/charter_bold_italic-webfont.eot');
-    src: url('{{ .Site.BaseURL }}fonts/charter_bold_italic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('{{ .Site.BaseURL }}fonts/charter_bold_italic-webfont.woff') format('woff'),
-         url('{{ .Site.BaseURL }}fonts/charter_bold_italic-webfont.ttf') format('truetype');
-    font-style: italic;
-    font-weight: bold;
-    font-display: fallback;
-}
-
-@font-face {
-    font-family: 'Fira Sans';
-    src: url('{{ .Site.BaseURL }}fonts/FiraSans-Book.eot');
-    src: url('{{ .Site.BaseURL }}fonts/FiraSans-Book.eot?#iefix') format('embedded-opentype'),
-         url('{{ .Site.BaseURL }}fonts/FiraSans-Book.woff2') format('woff2'),
-         url('{{ .Site.BaseURL }}fonts/FiraSans-Book.woff') format('woff'),
-         url('{{ .Site.BaseURL }}fonts/FiraSans-Book.ttf') format('truetype');
-    font-display: fallback;
-}
-
-@font-face {
-    font-family: 'Fira Sans';
-    src: url('{{ .Site.BaseURL }}fonts/FiraSans-Bold.eot');
-    src: url('{{ .Site.BaseURL }}fonts/FiraSans-Bold.eot?#iefix') format('embedded-opentype'),
-         url('{{ .Site.BaseURL }}fonts/FiraSans-Bold.woff2') format('woff2'),
-         url('{{ .Site.BaseURL }}fonts/FiraSans-Bold.woff') format('woff'),
-         url('{{ .Site.BaseURL }}fonts/FiraSans-Bold.ttf') format('truetype');
-    font-weight: bold;
-    font-display: fallback;
-}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index b5fe1a5..b6aab03 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -20,7 +20,7 @@
     <!-- IndieAuth endpoint -->
     <link rel="authorization_endpoint" href="https://indieauth.com/auth">
     <!-- Other stuff to make the site work -->
-    <style type="text/css">{{ partial "fonts.css" . | safeCSS }}</style>
+    <link rel="stylesheet" href="/css/fonts.css" />
     <link rel="stylesheet" href="/css/style.css" />
     {{ if (fileExists "/static/css/custom.css") -}}
     <link rel="stylesheet" href="/css/custom.css" />
diff --git a/static/css/fonts.css b/static/css/fonts.css
new file mode 100644
index 0000000..44776e3
--- /dev/null
+++ b/static/css/fonts.css
@@ -0,0 +1,72 @@
+@font-face{
+    font-family: 'Fira Code';
+    src: url('/fonts/FiraCode-Regular.eot');
+    src: url('/fonts/FiraCode-Regular.eot?#iefix') format('embedded-opentype'),
+         url('/fonts/FiraCode-Regular.woff2') format('woff2'),
+         url('/fonts/FiraCode-Regular.woff') format('woff'),
+         url('/fonts/FiraCode-Regular.ttf') format('truetype');
+    font-weight: 400;
+    font-style: normal;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: 'Charter';
+    src: url('/fonts/charter_regular-webfont.eot');
+    src: url('/fonts/charter_regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/fonts/charter_regular-webfont.woff') format('woff'),
+         url('/fonts/charter_regular-webfont.ttf') format('truetype');
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: 'Charter';
+    src: url('/fonts/charter_bold-webfont.eot');
+    src: url('/fonts/charter_bold-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/fonts/charter_bold-webfont.woff') format('woff'),
+         url('/fonts/charter_bold-webfont.ttf') format('truetype');
+    font-weight: bold;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: 'Charter';
+    src: url('/fonts/charter_italic-webfont.eot');
+    src: url('/fonts/charter_italic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/fonts/charter_italic-webfont.woff') format('woff'),
+         url('/fonts/charter_italic-webfont.ttf') format('truetype');
+    font-style: italic;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: 'Charter';
+    src: url('/fonts/charter_bold_italic-webfont.eot');
+    src: url('/fonts/charter_bold_italic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/fonts/charter_bold_italic-webfont.woff') format('woff'),
+         url('/fonts/charter_bold_italic-webfont.ttf') format('truetype');
+    font-style: italic;
+    font-weight: bold;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('/fonts/FiraSans-Book.eot');
+    src: url('/fonts/FiraSans-Book.eot?#iefix') format('embedded-opentype'),
+         url('/fonts/FiraSans-Book.woff2') format('woff2'),
+         url('/fonts/FiraSans-Book.woff') format('woff'),
+         url('/fonts/FiraSans-Book.ttf') format('truetype');
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('/fonts/FiraSans-Bold.eot');
+    src: url('/fonts/FiraSans-Bold.eot?#iefix') format('embedded-opentype'),
+         url('/fonts/FiraSans-Bold.woff2') format('woff2'),
+         url('/fonts/FiraSans-Bold.woff') format('woff'),
+         url('/fonts/FiraSans-Bold.ttf') format('truetype');
+    font-weight: bold;
+    font-display: fallback;
+}