diff options
author | Hanzei <Hanzei@users.noreply.github.com> | 2018-06-10 02:30:15 +0300 |
---|---|---|
committer | Vicky Lai <vicky@vickylai.com> | 2018-06-10 02:30:15 +0300 |
commit | 45420243599e3899afdec61fef5f835df47d98a0 (patch) | |
tree | 14fe56b1384c64d4e84b924a13111d0ba645409b | |
parent | 71a72311ac2302d6d9632853535d471416923f75 (diff) |
Fix rel URLs (#50)
-rw-r--r-- | layouts/_default/list.html | 2 | ||||
-rw-r--r-- | layouts/_default/single.html | 10 | ||||
-rw-r--r-- | layouts/_default/taxonomy.html | 2 | ||||
-rw-r--r-- | layouts/_default/terms.html | 4 | ||||
-rw-r--r-- | layouts/index.html | 18 | ||||
-rw-r--r-- | layouts/partials/header.html | 12 | ||||
-rw-r--r-- | layouts/partials/projects.html | 4 |
7 files changed, 25 insertions, 27 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 98f56b9..96a6ae9 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -38,7 +38,7 @@ <div class="container has-text-centered top-pad"> <hr> - <a href="{{ .Permalink }}#top"> + <a href="#top"> <i class="fa fa-arrow-up"></i> </a> <hr> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 600b50f..618dc76 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -12,7 +12,6 @@ <!-- Everything below fades in two! --> <div class="section {{ if .Site.Params.fadeIn }} fade-in two {{ end }}"> - <div class="container"> <!-- Begin Nav bar --> {{ partial "nav-single.html" . }} @@ -23,10 +22,9 @@ <!-- Begin blog post content --> {{ if .Params.image }} <div class="has-text-centered"> - <img src="{{ .Params.image }}" class="img-responsive"> + <img src="{{ .Params.image }}" class="img-responsive"> </div> - {{ end }} - + {{ end }} {{ .Content }} </div> <!-- End blog post content --> @@ -37,7 +35,7 @@ <div class="container has-text-centered top-pad"> <hr> - <a href="{{ .Permalink }}#top"> + <a href="#top"> <i class="fa fa-arrow-up"></i> </a> <hr> @@ -61,4 +59,4 @@ }) </script> -</body>
\ No newline at end of file +</body> diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 383bc3f..4b3ddc4 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -38,7 +38,7 @@ <div class="container has-text-centered top-pad"> <hr> - <a href="{{ .Permalink }}#top"> + <a href="#top"> <i class="fa fa-arrow-up"></i> </a> <hr> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 1a384d3..44e8b79 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -33,7 +33,7 @@ <div class="container has-text-centered top-pad"> <hr> - <a href="{{ .Permalink }}#top"> + <a href="#top"> <i class="fa fa-arrow-up"></i> </a> <hr> @@ -57,4 +57,4 @@ }) </script> -</body>
\ No newline at end of file +</body> diff --git a/layouts/index.html b/layouts/index.html index 9e0bae1..f626821 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -51,15 +51,15 @@ <div class="columns"><!-- Avatar and about.md side by side except mobile --> {{ if .Site.Params.avatar }} <div class="column is-one-third has-text-centered"> - <img class="img-responsive avatar" src="/{{ .Site.Params.avatar }}" alt="My profile picture."> + <img class="img-responsive avatar" src="{{ .Site.Params.avatar | relURL }}" alt="My profile picture."> </div> {{ end }} <div class="column markdown"> {{ range .Data.Pages }} {{if eq .Title "About" }} {{.Content}} - {{end}} - {{ end }} + {{end}} + {{ end }} </div> </div> </div><!-- End About container--> @@ -96,16 +96,16 @@ <div class="markdown"> {{ range .Data.Pages }} {{if eq .Title "Contact" }} - {{.Content}} - {{end}} - {{ end }} + {{.Content}} + {{end}} + {{ end }} </div> {{ if .Site.Params.localTime }} <p>My current local time is <span id="time"></span>.</p> - <script type="text/javascript" src={{ "js/moment.js" | absURL }}></script> - <script type="text/javascript" src={{ "js/moment-timezone.js" | absURL }}></script> - <script type="text/javascript" src={{ "js/moment-timezone-with-data-2012-2022.js" | absURL }}></script> + <script type="text/javascript" src="{{ "/js/moment.js" | relURL }}"></script> + <script type="text/javascript" src="{{ "/js/moment-timezone.js" | relURL }}"></script> + <script type="text/javascript" src="{{ "/js/moment-timezone-with-data-2012-2022.js" | relURL }}"></script> <script> $(document).ready(function() { diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 1f1b60f..95aeddd 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -34,25 +34,25 @@ {{ end }} <!-- jQuery --> -<script type="text/javascript" src={{ "js/jquery-3.3.1.min.js"| absURL }}></script> +<script type="text/javascript" src="{{ "/js/jquery-3.3.1.min.js" | relURL }}"></script> <!-- Fonts and icon CSS --> -<link rel="stylesheet" href={{ "css/font-awesome.min.css" | absURL }}> -<link rel="stylesheet" href={{ "css/nunito_sans.css" | absURL }}> +<link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | relURL }}"> +<link rel="stylesheet" href="{{ "/css/nunito_sans.css" | relURL }}"> {{ if .Site.Params.cacheBuster }} <link rel="stylesheet" href="{{ (printf "css/%s-style.css?t=%d" (.Site.Params.themeStyle | default "dark") now.Unix) |relURL }}"> {{ else }} - <link rel="stylesheet" href="{{ (printf "css/%s-style.css" .Site.Params.themeStyle | default "dark") | absURL }}"> + <link rel="stylesheet" href="{{ (printf "css/%s-style.css" .Site.Params.themeStyle | default "dark") | relURL }}"> {{ end }} <!-- Custom css --> {{ range .Site.Params.customCSS -}} - <link rel="stylesheet" href="{{ . | absURL }}"> + <link rel="stylesheet" href="{{ . | relURL }}"> {{- end }} <!-- Icon --> -<link rel="shortcut icon" href="{{ .Site.Params.faviconFile | default "img/favicon.ico" | absURL }}"> +<link rel="shortcut icon" href="{{ .Site.Params.faviconFile | default "img/favicon.ico" | relURL }}"> <!-- Google Analytics --> {{ template "_internal/google_analytics_async.html" . }} diff --git a/layouts/partials/projects.html b/layouts/partials/projects.html index 6a6b050..1adef84 100644 --- a/layouts/partials/projects.html +++ b/layouts/partials/projects.html @@ -14,7 +14,7 @@ <div class="card-image"> <figure class="image is-3by2"> <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}> - <img src="{{ if .Params.image }}{{ .Params.image }}{{ else }}{{ .Site.Params.placeHolderimg | default "img/workday.jpg" }}{{ end }}"> + <img src="{{ if .Params.image }}{{ .Params.image | relURL }}{{ else }}{{ (.Site.Params.placeHolderimg | default "/img/workday.jpg") | relURL }}{{ end }}"> </a> </figure> </div> @@ -42,7 +42,7 @@ </header> {{ end }} {{ if .Params.image }} - <img src="{{ .Params.image }}" class="img-responsive img-centered"> + <img src="{{ .Params.image | relURL }}" class="img-responsive img-centered"> {{ end }} {{ if .Content }} <section class="modal-card-body markdown"> |