Merge pull request #29 from AngeloStavrow/27-static-files-expect-root-directory

Move @font-face declarations to partial file (closes #27)

5 files changed, 100 insertions, 100 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7eb680..bede6d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Users can now add their Reddit account as a social network, thanks to [@sauerj](https://github.com/sauerj)!
+
 ### Fixed
 - The 404.html page now properly links back to the homepage, thanks to [@sauerj](https://github.com/sauerj)!
 - Custom fonts are now loaded correctly, hopefully speeding up rendering ([#23](https://github.com/AngeloStavrow/indigo/issues/23))
-- Users can now add their Reddit account as a social network, thanks to [@sauerj](https://github.com/sauerj)!
 
 ## [1.0.2]
 ### Fixed
diff --git a/layouts/partials/fonts.css b/layouts/partials/fonts.css
new file mode 100644
index 0000000..4e9aecd
--- /dev/null
+++ b/layouts/partials/fonts.css
@@ -0,0 +1,72 @@
+@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: optional;
+}
+
+@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: optional;
+}
+
+@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: optional;
+}
+
+@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: optional;
+}
+
+@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: optional;
+}
+
+@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: optional;
+}
+
+@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: optional;
+}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2f534bd..b02bdf6 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -20,6 +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="{{ .Site.BaseURL }}css/style.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
\ No newline at end of file
diff --git a/layouts/partials/social.html b/layouts/partials/social.html
index 42780a8..53d98ff 100644
--- a/layouts/partials/social.html
+++ b/layouts/partials/social.html
@@ -1,65 +1,63 @@
 <aside id="social">
   <div id="social-icons">
-    {{ with .Site.Params.EmailAddress }}
+    {{ if isset .Site.Params "emailaddress" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Email me" href="mailto:{{ . }}"><img src="/icons/envelope.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Email me" href="mailto:{{ .Site.Params.EmailAddress }}"><img src="{{ .Site.BaseURL }}icons/envelope.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.FacebookUser }}
+    {{ if isset .Site.Params "facebookuser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Facebook profile" href="{{ . }}"><img src="/icons/facebook.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Facebook profile" href="{{ .Site.Params.FacebookUser }}"><img src="{{ .Site.BaseURL }}icons/facebook.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.FlickrUser }}
+    {{ if isset .Site.Params "flickruser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Flickr profile" href="https://flickr.com/people/{{ . }}"><img src="/icons/flickr.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Flickr profile" href="https://flickr.com/people/{{ .Site.Params.FlickrUser }}"><img src="{{ .Site.BaseURL }}icons/flickr.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.GitHubUser }}
+    {{ if isset .Site.Params "githubuser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="GitHub profile" href="https://github.com/{{ . }}"><img src="/icons/github.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="GitHub profile" href="https://github.com/{{ .Site.Params.GitHubUser }}"><img src="{{ .Site.BaseURL }}icons/github.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.GitLabUser }}
+    {{ if isset .Site.Params "gitlabuser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="GitLab profile" href="https://gitlab.com/{{ . }}"><img src="/icons/gitlab.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="GitLab profile" href="https://gitlab.com/{{ .Site.Params.GitLabUser }}"><img src="{{ .Site.BaseURL }}icons/gitlab.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.GlitchUser }}
+    {{ if isset .Site.Params "glitchuser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Glitch profile" href="https://glitch.com/@{{ . }}"><img src="/icons/glitch.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Glitch profile" href="https://glitch.com/@{{ .Site.Params.GlitchUser }}"><img src="{{ .Site.BaseURL }}icons/glitch.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.KeybaseUser }}
+    {{ if isset .Site.Params "keybaseuser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Keybase profile" href="https://keybase.io/{{ . }}"><img src="/icons/keybase.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Keybase profile" href="https://keybase.io/{{ .Site.Params.KeybaseUser }}"><img src="{{ .Site.BaseURL }}icons/keybase.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.MicroBlogUser }}
+    {{ if isset .Site.Params "microbloguser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Micro.Blog profile" href="https://micro.blog/{{ . }}"><img src="/icons/microblog.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Micro.Blog profile" href="https://micro.blog/{{ .Site.Params.MicroBlogUser }}"><img src="{{ .Site.BaseURL }}icons/microblog.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.RedditUser }}
+    {{ if isset .Site.Params "reddituser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Reddit profile" href="https://www.reddit.com/user/{{ . }}">
-	<img src="/icons/reddit-alien.svg" height="24px" width="24px" />
-      </a>
+      <a class="glyph" alt="Reddit profile" href="https://www.reddit.com/user/{{ .Site.Params.RedditUser }}"><img src="{{ .Site.BaseURL }}icons/reddit-alien.svg" height="24px" width="24px" /></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.StackOverflowUser }}
+    {{ if isset .Site.Params "stackoverflowuser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Stack Overflow profile" href="https://stackoverflow.com/users/{{ . }}"><img src="/icons/stack-overflow.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Stack Overflow profile" href="https://stackoverflow.com/users/{{ .Site.Params.StackOverflowUser }}"><img src="{{ .Site.BaseURL }}icons/stack-overflow.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.TumblrUser }}
+    {{ if isset .Site.Params "tumblruser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Tumblr profile" href="https://{{ . }}.tumblr.com/"><img src="/icons/tumblr.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Tumblr profile" href="https://{{ .Site.Params.TumblrUser }}.tumblr.com/"><img src="{{ .Site.BaseURL }}icons/tumblr.svg" height="24px" width="24px"></a>
     </div>
     {{ end }}
-    {{ with .Site.Params.TwitterUser }}
+    {{ if isset .Site.Params "twitteruser" }}
     <div class="icon-24x24">
-      <a class="glyph" alt="Twitter profile" href="https://twitter.com/{{ . }}"><img src="/icons/twitter.svg" height="24px" width="24px"></a>
+      <a class="glyph" alt="Twitter profile" href="https://twitter.com/{{ .Site.Params.TwitterUser }}"><img src="{{ .Site.BaseURL }}icons/twitter.svg" height="24px" width="24px"></a>
      </div>
      {{ end }}
   </div>
diff --git a/static/css/style.css b/static/css/style.css
index 13ba7fc..569d557 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,76 +1,3 @@
-@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: optional;
-}
-
-@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: optional;
-}
-
-@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: optional;
-}
-
-@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: optional;
-}
-
-@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: optional;
-}
-
-@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: optional;
-}
-
-@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: optional;
-}
-
 * {
     box-sizing: border-box;
 }