Merge branch 'master' into template-search

assets/scss/custom.scss

@@ -0,0 +1 @@
+/* Place your custom SCSS in HUGO_SITE_FOLDER/assets/scss/custom.scss */

assets/scss/style.scss

@@ -25,6 +25,8 @@
 @import "partials/layout/404.scss";
 @import "partials/layout/search.scss";
 
+@import "custom.scss";
+
 a {
     text-decoration: none;
     color: var(--accent-color);

exampleSite/content/post/rich-content/index.md

@@ -13,14 +13,6 @@ Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-manageme
 <!--more-->
 ---
 
-## Instagram Simple Shortcode
-
-{{< instagram_simple BGvuInzyFAe hidecaption >}}
-
-<br>
-
----
-
 ## YouTube Privacy Enhanced Shortcode
 
 {{< youtube ZJthWmvUzzc >}}

layouts/_default/archives.html

@@ -19,7 +19,7 @@
     {{ range $filtered.GroupByDate "2006" }}
     {{ $id := lower (replace .Key " " "-") }}
     <div class="archives-group" id="{{ $id }}">
-        <h2 class="archives-date section-title"><a href="{{ $.Permalink }}#{{ $id }}">{{ .Key }}</a></h2>
+        <h2 class="archives-date section-title"><a href="{{ $.RelPermalink }}#{{ $id }}">{{ .Key }}</a></h2>
         <div class="article-list--compact">
             {{ range .Pages }}
                 {{ partial "article-list/compact" . }}

layouts/partials/article-list/compact.html

@@ -1,5 +1,5 @@
 <article>
-    <a href="{{ .Permalink }}">
+    <a href="{{ .RelPermalink }}">
         <div class="article-details">
             <h2 class="article-title">
                 {{- .Title -}}

layouts/partials/article-list/default.html

@@ -2,7 +2,7 @@
 <article class="{{ if $image.exists }}has-image{{ end }}">
     {{ if $image.exists }}
         <div class="article-image">
-            <a href="{{ .Permalink }}">
+            <a href="{{ .RelPermalink }}">
                 {{ if $image.resource }}
                     {{- $thumbnail := $image.resource.Fill "800x250" -}}
                     {{- $thumbnailRetina := $image.resource.Fill "1600x500" -}}

layouts/partials/article-list/tile.html

@@ -1,6 +1,6 @@
 {{ $image := partialCached "helper/image" (dict "Context" .context "Type" .Type) .context.RelPermalink .Type }}
 <article class="{{ if $image.exists }}has-image{{ end }}">
-    <a href="{{ .context.Permalink }}">
+    <a href="{{ .context.RelPermalink }}">
         
         {{ if $image.exists }}
             <div class="article-image">

layouts/partials/article/components/details.html

@@ -7,7 +7,7 @@
             {{ if and $image.exists $image.resource }}
                 {{- $imageRaw := $image.resource | resources.Fingerprint "md5"  -}}
                 {{- $20x := $imageRaw.Fill "20x20 smart"  -}}
-                <a href="{{ .Permalink }}" 
+                <a href="{{ .RelPermalink }}" 
                     class="color-tag"
                     data-image="{{ $20x.RelPermalink }}" 
                     data-key="{{ $context.Slug }}" 
@@ -15,14 +15,14 @@
                     {{ .LinkTitle }}
                 </a>
             {{ else }}
-                <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
+                <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
             {{ end }}
         {{ end }}
     </header>
     {{ end }}
 
     <h2 class="article-title">
-        <a href="{{ .Permalink }}">
+        <a href="{{ .RelPermalink }}">
             {{- .Title -}}
         </a>
     </h2>

layouts/partials/article/components/tags.html

@@ -1,7 +1,7 @@
 {{ if .Params.Tags }}
     <section class="article-tags">
         {{ range (.GetTerms "tags") }}
-            <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
+            <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
         {{ end }}
     </section>
 {{ end }}

layouts/partials/sidebar/left.html

@@ -31,7 +31,7 @@
         {{ $active := or (eq $currentPage.Title .Name) (or ($currentPage.HasMenuCurrent "main" .) ($currentPage.IsMenuCurrent "main" .)) }}
 
         <li {{ if $active }} class='current' {{ end }}>
-            <a href='{{ .URL | absLangURL }}'>
+            <a href='{{ .URL | relURL }}'>
                 {{ if .Pre }}
                     {{ partial "helper/icon" .Pre }}
                 {{ end }}

layouts/partials/widget/tag-cloud.html

@@ -6,7 +6,7 @@
 
     <div class="tagCloud-tags">
         {{ range first .Site.Params.widgets.tagCloud.limit .Site.Taxonomies.tags.ByCount }}
-            <a href="{{ .Page.Permalink }}" class="font_size_{{ .Count }}">
+            <a href="{{ .Page.RelPermalink }}" class="font_size_{{ .Count }}">
                 {{ .Page.Title }}
             </a>
         {{ end }}