Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various links #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions layouts/blog/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ <h1>{{ .Title }}</h1>
<div class="col-lg-4 col-md-6">
<article class="blog-post-item">
<div class="blog-post-thumb">
<a href="{{ .Permalink }}">
<img src="{{ .Params.featureImage | absURL }}" alt="blog-thumb"
<a href="{{ .RelPermalink }}">
<img src="{{ .Site.Home.RelPermalink }}{{ .Params.featureImage }}" alt="blog-thumb"
/></a>
</div>
<div class="blog-post-content">
<h2>
<a href="{{ .Permalink }}"
<a href="{{ .RelPermalink }}"
>{{ .Title }}</a
>
</h2>
<div class="post-author">
<div class="thumb">
<img src="{{ .Params.authorThumb | absURL }}" alt="author-thumb" />
<img src="{{ .Site.Home.RelPermalink }}{{ .Params.authorThumb }}" alt="author-thumb" />
</div>
<div class="meta">
<h3>{{ .Params.author }}</h3>
Expand Down Expand Up @@ -69,4 +69,4 @@ <h3>{{ .Params.author }}</h3>
</div>
</section>

{{ end }}
{{ end }}
4 changes: 2 additions & 2 deletions layouts/blog/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2>
<div class="post-meta">
<ul>
<li>
<img src="{{ .Params.authorThumb | absURL }}" alt="author-thumb" />
<img src="{{ .Site.Home.RelPermalink }}{{ .Params.authorThumb }}" alt="author-thumb" />
</li>
<li>
<h5>
Expand Down Expand Up @@ -39,4 +39,4 @@ <h5>
</div>
</section>

{{ end }}
{{ end }}
10 changes: 5 additions & 5 deletions layouts/partials/blogPost.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ <h2>{{ .title }}</h2>
<div class="col-lg-4 col-md-6">
<article class="blog-post-item">
<div class="blog-post-thumb">
<a href="{{ .Permalink }}">
<a href="{{ .RelPermalink }}">
<img src="{{ .Params.featureImage }}" alt="post-thumb"
/></a>
</div>
<div class="blog-post-content">
<h2>
<a href="{{ .Permalink }}"
<a href="{{ .RelPermalink }}"
>{{ .Title }}</a
>
</h2>
<div class="post-author">
<div class="thumb">
<img src="{{ .Params.authorThumb }}" alt="author-thumb" />
<img src="{{ .Site.Home.RelPermalink }}{{ .Params.authorThumb }}" alt="author-thumb" />
</div>
<div class="meta">
<h3>{{ .Params.author }}</h3>
Expand All @@ -38,12 +38,12 @@ <h3>{{ .Params.author }}</h3>
</div>
{{ end }}
<div class="see-all-post col-12">
<a href="{{ "blog" | absURL }}" data-text="{{ .blogButtonText }}" class="btn btn-primary">
<a href="{{ "blog" }}" data-text="{{ .blogButtonText }}" class="btn btn-primary">
<span>{{ .blogButtonText }}</span>
</a>
</div>
</div>
</div>
</section>
{{ end }}
{{ end }}
{{ end }}
12 changes: 6 additions & 6 deletions layouts/partials/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h2>{{ .Site.Params.footerTitle }}</h2>
<div class="row">
<div class="col-lg-4 col-md-4">
<div class="footer-description">
<img src="{{ .Site.Params.logo | absURL }}" alt="logo">
<img src="{{ $.Site.Home.RelPermalink }}{{ .Site.Params.logo }}" alt="logo">
<p>
{{ .Site.Params.copyright1 }}
</br>
Expand All @@ -73,7 +73,7 @@ <h4>Sitemap</h4>
<ul>
{{ $sitemap := .Site.Menus.sitemap }}
{{ range $sitemap }}
<li><a href="{{ .URL | absURL }}">{{ .Name }}</a></li>
<li><a href="{{ .URL }}">{{ .Name }}</a></li>
{{ end }}
</ul>
</div>
Expand All @@ -97,10 +97,10 @@ <h4>Address</h4>
</footer>

{{ $style := resources.Get "scss/non-critical.scss" | resources.ToCSS | minify }}
<link href="{{ $style.Permalink }}" rel="stylesheet" />
<link href="{{ $style.RelPermalink }}" rel="stylesheet" />
{{ $vendor := resources.Get "js/vendor.js" | minify }}
<script src="{{ $vendor.Permalink }}"></script>
<script src="{{ $vendor.RelPermalink }}"></script>
<!-- {{ $formhandler := resources.Get "js/form-handler.js" | minify }}
<script src="{{ $formhandler.Permalink }}"></script> -->
<script src="{{ $formhandler.RelPermalink }}"></script> -->
{{ $script := resources.Get "js/script.js" | minify }}
<script src="{{ $script.Permalink }}"></script>
<script src="{{ $script.RelPermalink }}"></script>
8 changes: 4 additions & 4 deletions layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />

{{ "<!-- Themify -->" | safeHTML }}
<link rel="stylesheet" href="{{ "themify/themify.css" | absURL }}">
<link rel="stylesheet" href="{{ $.Site.Home.RelPermalink }}{{ "themify/themify.css" }}">

{{ "<!-- Critical CSS -->" | safeHTML }}
{{ $stylex := resources.Get "scss/critical.scss" | resources.ToCSS | minify }}
<link href="{{ $stylex.Permalink }}" rel="stylesheet" />
<link href="{{ $stylex.RelPermalink }}" rel="stylesheet" />

{{ "<!--Favicon-->" | safeHTML }}
<link rel="shortcut icon" href="{{ "images/favicon.png" | absURL }}" type="image/x-icon" />
<link rel="icon" href="{{ "images/favicon.png" | absURL }}" type="image/x-icon" />
<link rel="shortcut icon" href="{{ .Site.Home.RelPermalink }}{{ "images/favicon.png" }}" type="image/x-icon" />
<link rel="icon" href="{{ .Site.Home.RelPermalink }}{{ "images/favicon.png" }}" type="image/x-icon" />
{{ with site.Params.googleAnalytics }}
{{ "<!-- Google Analytics -->" | safeHTML }}
<script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
Expand Down
8 changes: 4 additions & 4 deletions layouts/partials/header.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<nav class="main-nav navbar navbar-expand-lg">
<div class="container-fluid">
{{ "<!-- Logo -->" | safeHTML }}
<a class="navbar-brand" href="{{ .Site.BaseURL }}">
<a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
<img
class="logo-main"
src="{{ .Site.Params.logo | absURL }}"
src="{{ .Site.Home.RelPermalink }}{{ .Site.Params.logo }}"
alt="logo-white"
/>
</a>
Expand All @@ -26,13 +26,13 @@
<ul class="navbar-nav ml-auto">
{{ range $index, $element := $menu }}
<li class="nav-item">
<a href="{{ $.Site.BaseURL }}{{ .URL }}" class="nav-link {{ if $.IsHome }}scroll{{ end }}">{{ .Name }}</a>
<a href="{{ $.Site.Home.RelPermalink }}{{ .URL }}" class="nav-link {{ if $.IsHome }}scroll{{ end }}">{{ .Name }}</a>
</li>
{{ end }}
</ul>
<div class="account-list list-inline">
<li class="list-inline-item">
<a href="{{ "contact" | absURL }}" class="btn btn-sm btn-violate">
<a href="{{ $.Site.Home.RelPermalink }}{{ "contact" }}" class="btn btn-sm btn-violate">
Get in touch
</a>
</li>
Expand Down