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

Replace {{ .URL }} with {{ .Permalink }} #216

Merged
merged 1 commit into from
Oct 26, 2019
Merged
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
4 changes: 2 additions & 2 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ <h1 class="f3">{{ i18n "more" }}</h1>
{{/* Now, range through the next four after the initial $n_posts items. Nest the requirements, "after" then "first" on the outside */}}
{{ range (first 4 (after $n_posts $section)) }}
<h2 class="f5 fw4 mb4 dib mr3">
<a href="{{ .URL }}" class="link black dim">
<a href="{{ .Permalink }}" class="link black dim">
{{ .Title }}
</a>
</h2>
{{ end }}

{{/* As above, Use $section_name to get the section title, and URL. Use "with" to only show it if it exists */}}
{{ with .Site.GetPage "section" $section_name }}
<a href="{{ .URL }}" class="link db f6 pa2 br3 bg-mid-gray white dim w4 tc">{{ i18n "allTitle" . }}</a>
<a href="{{ .Permalink }}" class="link db f6 pa2 br3 bg-mid-gray white dim w4 tc">{{ i18n "allTitle" . }}</a>
{{ end }}
</section>
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/site-navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ul class="pl0 mr3">
{{ range .Site.Menus.main }}
<li class="list f5 f4-ns fw4 dib pr3">
<a class="hover-white no-underline white-90" href="{{ .URL }}" title="{{ .Name }} page">
<a class="hover-white no-underline white-90" href="{{ .Permalink }}" title="{{ .Name }} page">
{{ .Name }}
</a>
</li>
Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/summary-with-image.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
{{/* Trimming the slash and adding absURL make sure the image works no matter where our site lives */}}
{{ $featured_image := (trim $featured_image "/") | absURL }}
<div class="pr3-ns mb4 mb0-ns w-100 w-40-ns">
<a href="{{.URL}}" class="db grow">
<a href="{{.Permalink}}" class="db grow">
<img src="{{ $featured_image }}" class="img" alt="image from {{ .Title }}">
</a>
</div>
{{ end }}
<div class="blah w-100{{ if .Params.featured_image }} w-60-ns pl3-ns{{ end }}">
<h1 class="f3 fw1 athelas mt0 lh-title">
<a href="{{.URL}}" class="color-inherit dim link">
<a href="{{.Permalink}}" class="color-inherit dim link">
{{ .Title }}
</a>
</h1>
<div class="f6 f5-l lh-copy nested-copy-line-height nested-links">
{{ .Summary }}
</div>
<a href="{{.URL}}" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">{{ $.Param "read_more_copy" | default (i18n "readMore") }}</a>
<a href="{{.Permalink}}" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">{{ $.Param "read_more_copy" | default (i18n "readMore") }}</a>
{{/* TODO: add author
<p class="f6 lh-copy mv0">By {{ .Author }}</p> */}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="bg-white mb3 pa4 gray overflow-hidden">
<span class="f6 db">{{ humanize .Section }}</span>
<h1 class="f3 near-black">
<a href="{{ .URL }}" class="link black dim">
<a href="{{ .Permalink }}" class="link black dim">
{{ .Title }}
</a>
</h1>
Expand Down
2 changes: 1 addition & 1 deletion layouts/post/summary-with-image.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<article class="bb b--black-10">
<a class="db pv4 ph3 ph0-l no-underline dark-gray dim" href="{{ .URL }}">
<a class="db pv4 ph3 ph0-l no-underline dark-gray dim" href="{{ .Permalink }}">
<div class="flex flex-column flex-row-ns">
{{ if .Params.featured_image }}
<div class="pr3-ns mb4 mb0-ns w-100 w-40-ns">
Expand Down
2 changes: 1 addition & 1 deletion layouts/post/summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</div>
{{ end }}
<h1 class="f3 near-black">
<a href="{{ .URL }}" class="link black dim">
<a href="{{ .Permalink }}" class="link black dim">
{{ .Title }}
</a>
</h1>
Expand Down