Merge branch 'master' into master

assets/scss/grid.scss

@@ -3,10 +3,12 @@
     margin-right: auto;
 
     .left-sidebar {
+        order: -3;
         max-width: var(--left-sidebar-max-width);
     }
 
     .right-sidebar {
+        order: -1;
         max-width: var(--right-sidebar-max-width);
 
         /// Display right sidebar when min-width: lg
@@ -73,6 +75,7 @@
 }
 
 main.main {
+    order: -2;
     min-width: 0;
     max-width: 100%;
     flex-grow: 1;

exampleSite/config.yaml

@@ -8,15 +8,18 @@ languages:
     en:
         languageName: English
         title: Example Site
+        description: Example description
         weight: 1
     zh-cn:
         languageName: 中文
         title: 演示站点
+        description: 演示说明
         weight: 2
     ar:
         languageName: عربي
         languagedirection: rtl
         title: موقع تجريبي
+        description: وصف تجريبي
         weight: 3
 
 # Change it to your Disqus shortname before using

i18n/pt-pt.yaml

@@ -0,0 +1,67 @@
+toggleMenu:
+    other: Alternar Menu
+
+darkMode:
+    other: Modo Escuro
+
+list:
+    page:
+        one: "{{ .Count }} página"
+        other: "{{ .Count }} páginas"
+
+    section:
+        other: Secção
+
+    subsection:
+        one: Subsecção
+        other: Subsecções
+
+article:
+    back:
+        other: Voltar
+
+    tableOfContents:
+        other: Índice
+
+    relatedContent:
+        other: Conteúdo relacionado
+
+    lastUpdatedOn:
+        other: Última atualização a
+
+    readingTime:
+        one: "{{ .Count }} minuto de leitura"
+        other: "{{ .Count }} minutos de leitura"
+
+notFound:
+    title:
+        other: Não Encontrado
+    subtitle:
+        other: Esta página não existe.
+
+widget:
+    archives:
+        title:
+            other: Arquivos
+        more:
+            other: Mais
+    tagCloud:
+        title:
+            other: Tags
+    categoriesCloud:
+        title:
+            other: Categorias
+
+search:
+    title:
+        other: Pesquisa
+    placeholder:
+        other: Escreva algo...
+    resultTitle:
+        other: "#PAGES_COUNT páginas (#TIME_SECONDS segundos)"
+
+footer:
+    builtWith:
+        other: Criado com {{ .Generator }}
+    designedBy:
+        other: Tema {{ .Theme }} desenvolvido por {{ .DesignedBy }}

layouts/_default/baseof.html

@@ -18,10 +18,10 @@
             {{- block "left-sidebar" . -}}
                 {{ partial "sidebar/left.html" . }}
             {{- end -}}
+            {{- block "right-sidebar" . -}}{{ end }}
             <main class="main full-width">
                 {{- block "main" . }}{{- end }}
             </main>
-            {{- block "right-sidebar" . -}}{{ end }}
         </div>
         {{ partial "footer/include.html" . }}
     </body>

layouts/partials/article/components/details.html

@@ -34,7 +34,7 @@
             </div>
         {{ end }}
 
-        {{ if .Site.Params.article.readingTime }}
+        {{ if (.Params.readingTime | default (.Site.Params.article.readingTime)) }}
             <div>
                 {{ partial "helper/icon" "clock" }}
                 <time class="article-time--reading">
@@ -55,4 +55,4 @@
             </div>
         </footer>
     {{ end }}
-</div>
+</div>

layouts/partials/data/description.html

@@ -1,6 +1,11 @@
 <!-- Use site subtitle by default -->
 {{ $description := .Site.Params.sidebar.subtitle }}
 
+<!-- Seprate description exists -->
+{{ if .Site.Params.description }}
+    {{ $description = .Site.Params.description }}
+{{ end }}
+
 {{ if .Description }}
     <!-- Page description exists -->
     {{ $description = .Description }}

layouts/partials/footer/footer.html

@@ -1,4 +1,4 @@
-{{- $ThemeVersion := "3.14.0" -}}
+{{- $ThemeVersion := "3.15.0" -}}
 <footer class="site-footer">
     <section class="copyright">
         &copy; 

layouts/partials/head/head.html

@@ -3,6 +3,7 @@
 
 {{- $description := partialCached "data/description" . .RelPermalink -}}
 <meta name='description' content='{{ $description }}'>
+{{ with .Params.Keywords }}<meta name="keywords" content="{{ delimit . ", " }}">{{ end }}
 
 {{- $title := partialCached "data/title" . .RelPermalink -}}
 <title>{{ $title }}</title>

layouts/partials/sidebar/left.html

@@ -45,6 +45,7 @@
                         href='{{ .URL }}'
                         {{ if eq (default true .Params.newTab) true }}target="_blank"{{ end }}
                         {{ with .Name }}title="{{ . }}"{{ end }}
+                        rel="me"
                     >
                         {{ $icon := default "link" .Params.Icon }}
                         {{ with $icon }}