diff options
author | Angelo Stavrow <contact@angelostavrow.com> | 2019-09-28 16:06:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-28 16:06:38 +0300 |
commit | d8383b1180a87a60ce0cc5c275a740c643c82e55 (patch) | |
tree | c08d6cb5d6200733510e896da186959ed5ab885f | |
parent | 3f043a27d0a20ceccb0f477e60aa485dac6a48d9 (diff) | |
parent | d81a43d98da39b04945debee2aef8fb96895fa8e (diff) |
Merge pull request #61 from AngeloStavrow/57_remove-forward-slashes-in-urls
Remove forward slashes in urls
-rw-r--r-- | layouts/404.html | 2 | ||||
-rw-r--r-- | layouts/partials/footer.html | 2 | ||||
-rw-r--r-- | layouts/partials/head.html | 18 | ||||
-rw-r--r-- | layouts/partials/header.html | 2 | ||||
-rw-r--r-- | layouts/partials/social.html | 28 | ||||
-rw-r--r-- | static/css/fonts.css | 64 |
6 files changed, 58 insertions, 58 deletions
diff --git a/layouts/404.html b/layouts/404.html index 1f0e7bb..248651d 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -3,7 +3,7 @@ {{ partial "head.html" . }} <body> <div id="sitelogo"> - <a class="glyph" alt="Home" href="{{ .Site.BaseURL }}"><img src="{{ .Site.BaseURL }}images/site-logo.svg" alt="Site Logo" height="64px" width="64px"></a> + <a class="glyph" alt="Home" href="{{ .Site.BaseURL }}"><img src={{ "images/site-logo.svg" | absURL }} alt="Site Logo" height="64px" width="64px"></a> </div> <header> {{ partial "pagenav.html" . }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 864138b..35f8718 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,7 +1,7 @@ <!-- Footer content --> {{ if .Site.Params.ShowBio }} <div class="h-card"> - <img class="u-photo" src="{{ .Site.BaseURL }}{{ .Site.Params.Avatar }}" /> + <img class="u-photo" src="{{ .Site.Params.Avatar | absURL }}" /> <div class="card-content"> <h2 class="card-name"><a class="p-name u-url" href="{{ .Site.BaseURL }}" rel="me">{{ .Site.Params.Author }}</a></h2> <p class="card-subhead"> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index b6aab03..60cfd32 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -5,11 +5,11 @@ <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ .Site.Params.description }}{{ end }}"> <meta name="author" content="{{ .Site.Params.AuthorName }}"> <!-- Favicon details --> - <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"> - <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"> - <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"> - <link rel="manifest" href="/site.webmanifest"> - <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#00416a"> + <link rel="apple-touch-icon" sizes="180x180" href={{ "apple-touch-icon.png" | absURL }}> + <link rel="icon" type="image/png" sizes="32x32" href={{ "favicon-32x32.png" | absURL }}> + <link rel="icon" type="image/png" sizes="16x16" href={{ "favicon-16x16.png" | absURL }}> + <link rel="manifest" href={{ "site.webmanifest" | absURL }}> + <link rel="mask-icon" href={{ "safari-pinned-tab.svg" | absURL }} color="#00416a"> <meta name="msapplication-TileColor" content="#00aba9"> <meta name="theme-color" content="#ffffff"> <!-- IndieWeb identity --> @@ -20,10 +20,10 @@ <!-- IndieAuth endpoint --> <link rel="authorization_endpoint" href="https://indieauth.com/auth"> <!-- Other stuff to make the site work --> - <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" /> + <link rel="stylesheet" href={{ "css/fonts.css" | absURL }} /> + <link rel="stylesheet" href={{ "css/style.css" | absURL }} /> + {{ if (fileExists "static/css/custom.css") -}} + <link rel="stylesheet" href={{ "css/custom.css" | absURL }} /> {{- end }} <meta name="viewport" content="width=device-width, initial-scale=1"> </head> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index e2a1dc0..a9b7a2e 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -3,7 +3,7 @@ {{ partial "head.html" . }} <body> <div id="sitelogo"> - <a class="glyph" alt="Home" href="{{ .Site.BaseURL }}"><img src="{{ .Site.BaseURL }}images/site-logo.svg" alt="Site Logo" height="64px" width="64px"></a> + <a class="glyph" alt="Home" href="{{ .Site.BaseURL }}"><img src={{ "images/site-logo.svg" | absURL }} alt="Site Logo" height="64px" width="64px"></a> </div> <header> {{ partial "pagenav.html" . }} diff --git a/layouts/partials/social.html b/layouts/partials/social.html index cf9a08a..f43d1f5 100644 --- a/layouts/partials/social.html +++ b/layouts/partials/social.html @@ -2,72 +2,72 @@ <div id="social-icons"> {{ if isset .Site.Params "emailaddress" }} <div class="icon-24x24"> - <a class="glyph" alt="Email me" href="mailto:{{ .Site.Params.EmailAddress }}"><img src="{{ .Site.BaseURL }}icons/envelope.svg" height="24px" width="24px"></a> + <a class="glyph" alt="Email me" href="mailto:{{ .Site.Params.EmailAddress }}"><img src={{ "icons/envelope.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "facebookuser" }} <div class="icon-24x24"> - <a class="glyph" alt="Facebook profile" href="{{ .Site.Params.FacebookUser }}"><img src="{{ .Site.BaseURL }}icons/facebook.svg" height="24px" width="24px"></a> + <a class="glyph" alt="Facebook profile" href="{{ .Site.Params.FacebookUser }}"><img src={{ "icons/facebook.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "flickruser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="Flickr profile" href="https://flickr.com/people/{{ .Site.Params.FlickrUser }}"><img src={{ "icons/flickr.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "githubuser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="GitHub profile" href="https://github.com/{{ .Site.Params.GitHubUser }}"><img src={{ "icons/github.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "gitlabuser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="GitLab profile" href="https://gitlab.com/{{ .Site.Params.GitLabUser }}"><img src={{ "icons/gitlab.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "glitchuser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="Glitch profile" href="https://glitch.com/@{{ .Site.Params.GlitchUser }}"><img src={{ "icons/glitch.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "keybaseuser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="Keybase profile" href="https://keybase.io/{{ .Site.Params.KeybaseUser }}"><img src={{ "icons/keybase.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "linkedinuser" }} <div class="icon-24x24"> - <a class="glyph" alt="LinkedIn profile" href="https://www.linkedin.com/in/{{ .Site.Params.LinkedInUser }}"><img src="{{ .Site.BaseURL }}icons/linkedin.svg" height="24px" width="24px"></a> + <a class="glyph" alt="LinkedIn profile" href="https://www.linkedin.com/in/{{ .Site.Params.LinkedInUser }}"><img src={{ "icons/linkedin.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "mediumuser" }} <div class="icon-24x24"> - <a class="glyph" alt="Medium profile" href="https://medium.com/{{ .Site.Params.MediumUser }}"><img src="{{ .Site.BaseURL }}icons/medium.svg" height="24px" width="24px"></a> + <a class="glyph" alt="Medium profile" href="https://medium.com/{{ .Site.Params.MediumUser }}"><img src={{ "icons/medium.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "microbloguser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="Micro.Blog profile" href="https://micro.blog/{{ .Site.Params.MicroBlogUser }}"><img src={{ "icons/microblog.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "reddituser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="Reddit profile" href="https://www.reddit.com/user/{{ .Site.Params.RedditUser }}"><img src={{ "icons/reddit-alien.svg" | absURL }} height="24px" width="24px" /></a> </div> {{ end }} {{ if isset .Site.Params "stackoverflowuser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="Stack Overflow profile" href="https://stackoverflow.com/users/{{ .Site.Params.StackOverflowUser }}"><img src={{ "icons/stack-overflow.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "tumblruser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="Tumblr profile" href="https://{{ .Site.Params.TumblrUser }}.tumblr.com/"><img src={{ "icons/tumblr.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} {{ if isset .Site.Params "twitteruser" }} <div class="icon-24x24"> - <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> + <a class="glyph" alt="Twitter profile" href="https://twitter.com/{{ .Site.Params.TwitterUser }}"><img src={{ "icons/twitter.svg" | absURL }} height="24px" width="24px"></a> </div> {{ end }} </div> diff --git a/static/css/fonts.css b/static/css/fonts.css index 44776e3..ad1f5c4 100644 --- a/static/css/fonts.css +++ b/static/css/fonts.css @@ -1,10 +1,10 @@ -@font-face{ +@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'); + 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; @@ -12,39 +12,39 @@ @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'); + 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'); + 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'); + 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'); + 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; @@ -52,21 +52,21 @@ @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'); + 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'); + 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; } |