Merge branch 'main' into autoprefixer-1667142184

i18n/fr.toml

@@ -87,7 +87,7 @@ other = "En savoir plus"
 other = "Montrer moins"
 
 [responsibilities]
-other = "Responsabilités :"
+other = "Responsabilitiés :"
 
 [present]
 other = "Aujourd'hui"

layouts/_default/index.json

@@ -1,5 +1,5 @@
 {{- $.Scratch.Add "index" slice -}}
-{{- range (where .Site.RegularPages "Layout" "!=" "search") -}}
+{{- range .Site.RegularPages -}}
     {{- $.Scratch.Add "index" (dict "title" .Title "hero" (partial "helpers/get-hero.html" .) "date" (.Date.Format "January 2, 2006") "summary" .Summary "tags" .Params.tags "categories" .Params.categories "contents" .Plain "permalink" .Permalink) -}}
 {{- end -}}
 {{- $.Scratch.Get "index" | jsonify -}}

layouts/_default/single.html

@@ -24,7 +24,7 @@
         </form>
         <div class="sidebar-tree">
           <ul class="tree" id="tree">
-            <li id="list-heading"><a href="{{ "/posts/" | relLangURL }}" data-filter="all">{{ i18n "posts" }}</a></li>
+            <li id="list-heading"><a href="{{ "/posts" | relLangURL }}" data-filter="all">{{ i18n "posts" }}</a></li>
             <div class="subtree">
                 {{ partial "navigators/sidebar.html" (dict "menuName" "sidebar" "menuItems" site.Menus.sidebar "ctx" .) }}
             </div>
@@ -58,7 +58,7 @@
         <div class="taxonomy-terms">
           <ul style="padding-left: 0;">
             {{ range .Params.tags }}
-            {{ $url:= printf "tags/%s/" . }}
+            {{ $url:= printf "tags/%s" . }}
             <li class="rounded"><a href="{{ $url | urlize | relLangURL }}" class="btn, btn-sm">{{ . }}</a></li>
             {{ end }}
           </ul>

layouts/partials/comments/valine.html

@@ -1,6 +1,6 @@
 {{ with .valine }}
 <div id="vcomments"></div>
-<script src="//code.bdstatic.com/npm/leancloud-storage@4.12.0/dist/av-min.js"></script>
+<script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
 <script src="//unpkg.com/valine/dist/Valine.min.js"></script>
 <script type="text/javascript">
   new Valine({
@@ -13,7 +13,6 @@
     lang: "{{ .lang }}",
     recordIP: "{{ .recordIP }}",
     enableQQ: "{{ .enableQQ }}",
-    serverURLs: "https://{{ .serverURLs  }}.api.lncldglobal.com"
   });
 </script>
-{{ end }}
+{{ end }}

layouts/partials/helpers/get-hero.html

@@ -3,12 +3,7 @@
 
 {{/*  if hero image is specified in the page front-matter, then use that  */}}
 {{ if .Params.hero }}
-  {{/*  try to read from the page bundle  */}}
+  {{ $heroImage = resources.Get .Params.hero }}
-  {{ $heroImage = .Resources.Get .Params.hero }}
-  {{/*  if the image does not exist in the page bundle,try looking in the assets folder  */}}
-  {{ if not $heroImage }}
-    {{ $heroImage = resources.Get .Params.hero }}
-  {{ end }}
 {{ end }}
 {{ .Scratch.Set "heroScratch" $heroImage }}
 

layouts/partials/navigators/navbar.html

@@ -106,12 +106,12 @@
         {{ end }}
         {{ if $blogEnabled }}
           <li class="nav-item">
-            <a class="nav-link" id="blog-link" href="{{ "/posts/" | relLangURL }}">{{ i18n "posts" }}</a>
+            <a class="nav-link" id="blog-link" href="{{ "/posts" | relLangURL }}">{{ i18n "posts" }}</a>
           </li>
         {{ end }}
         {{ if $notesEnabled }}
           <li class="nav-item">
-            <a class="nav-link" id="note-link" href="{{ "/notes/" | relLangURL }}">{{ i18n "notes" }}</a>
+            <a class="nav-link" id="note-link" href="{{ "/notes" | relLangURL }}">{{ i18n "notes" }}</a>
           </li>
         {{ end }}
         {{ range $customMenus }}

layouts/partials/navigators/sidebar.html

@@ -17,6 +17,6 @@
     </li>
   {{ else }}
     <!-- No sub-tree. So, only add current entry -->
-    <li><a class="{{$class}}" href="{{ .PageRef | default .URL }}" title="{{ .Name }}">{{.Name}}</a></li>
+    <li><a class="{{$class}}" href="{{ .URL }}" title="{{ .Name }}">{{.Name}}</a></li>
   {{ end }}
 {{ end }}

layouts/partials/navigators/theme-selector.html

@@ -4,17 +4,17 @@
   default-theme="{{ site.Params.darkMode.default }}"></div>
 <a class="nav-link dropdown-toggle"  href="#" id="themeSelector" role="button"
   data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-  <img id="navbar-theme-icon-svg" src="{{ "/icons/moon-svgrepo-com.svg" }}" width=20 alt="Dark Theme">
+  <img id="navbar-theme-icon-svg" src="{{ "/icons/moon-svgrepo-com.svg" }}" width=20>
 </a>
 <div class="dropdown-menu dropdown-menu-icons-only" aria-labelledby="themeSelector">
   <a class="dropdown-item nav-link" href="#" onclick="enableLightTheme()">
-    <img class="menu-icon-center" src="{{ "/icons/sun-svgrepo-com.svg" }}" width=20 alt="Light Theme">
+    <img class="menu-icon-center" src="{{ "/icons/sun-svgrepo-com.svg" }}" width=20>
   </a>
   <a class="dropdown-item nav-link" href="#" onclick="enableDarkTheme()">
-    <img class="menu-icon-center" src="{{ "/icons/moon-svgrepo-com.svg" }}" width=20 alt="Dark Theme">
+    <img class="menu-icon-center" src="{{ "/icons/moon-svgrepo-com.svg" }}" width=20>
   </a>
   <a class="dropdown-item nav-link" href="#" onclick="useSystemTheme()">
-    <img class="menu-icon-center" src="{{ "/icons/computer-svgrepo-com.svg" }}" width=20 alt="System Theme">
+    <img class="menu-icon-center" src="{{ "/icons/computer-svgrepo-com.svg" }}" width=20>
   </a>
 </div>
 </li>

layouts/partials/sections/recent-posts.html

@@ -19,7 +19,7 @@
   {{ end }}
   <div class="container">
     <div class="row" id="recent-post-cards">
-      {{ range first $numShow (where (where site.RegularPages.ByDate.Reverse "Type" "posts" ) "Layout" "!=" "search") }}
+      {{ range first $numShow (where site.RegularPages.ByDate.Reverse "Type" "in" "posts" )}}
         {{ partial "cards/recent-post.html" . }}
       {{ end }}
     </div>

package-lock.json

@@ -9,7 +9,7 @@
       "license": "MIT",
       "devDependencies": {
         "autoprefixer": "^10.4.13",
-        "postcss": "^8.4.19",
+        "postcss": "^8.4.18",
         "postcss-cli": "^8.3.1"
       }
     },
@@ -692,9 +692,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.19",
+      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
+      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
       "dev": true,
       "funding": [
         {
@@ -1543,9 +1543,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.19",
+      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
+      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.4",

package.json

@@ -18,7 +18,7 @@
   "homepage": "https://github.com/hugo-toha/toha#readme",
   "devDependencies": {
     "autoprefixer": "^10.4.13",
-    "postcss": "^8.4.19",
+    "postcss": "^8.4.18",
     "postcss-cli": "^8.3.1"
   }
 }