Merge branch 'main' into fix-horizontal-scrollbar

i18n/fr.toml

@@ -3,7 +3,7 @@
 other = "Accueil"
 
 [posts]
-other = "Des postes"
+other = "Articles"
 
 [toc_heading]
 other = "Table des matières"
@@ -89,8 +89,8 @@ other = "Montrer moins"
 # [comments_by]
 # other = "comments powered by"
 
-# [read]
+[read]
-# other = "Read"
+other = "Lire"
 
 # [project_star]
 # other = "Star"

layouts/partials/cards/project.html

@@ -11,7 +11,7 @@
 
             {{ $logoImage:= resources.Get .logo}}
             {{ if $logoImage }}
-            {{ $logoImage := $logoImage.Fit "24x24" }}
+            {{ $logoImage = $logoImage.Fit "24x24" }}
 
             <img class="card-img-xs" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
             {{ end }}

layouts/partials/cards/skill.html

@@ -7,7 +7,7 @@
 
           {{/*  svg don't support "Fit" operation   */}}
           {{ if ne $logoImage.MediaType.SubType "svg" }}
-            {{ $logoImage := $logoImage.Fit "24x24" }}
+            {{ $logoImage = $logoImage.Fit "24x24" }}
           {{ end }}
 
           <img class="card-img-xs" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />

layouts/partials/header.html

@@ -1,18 +1,3 @@
-{{/* default favicon */}}
-{{ $favicon := "/images/favicon.png" }}
-
-{{/* if favicon is provided in the config, then use that */}}
-{{ if site.Params.logo.favicon }}
-  {{ $favicon = site.Params.logo.favicon }}
-{{ end }}
-
-{{/* resize the favicon. don't resize svg because it is not supported */}}
-{{ $favicon := resources.Get $favicon }}
-{{ if and $favicon (ne $favicon.MediaType.SubType "svg") }}
-  {{ $favicon = $favicon.Resize "42x" }}
-{{ end }}
-{{ $favicon = $favicon.RelPermalink}}
-
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta http-equiv="X-UA-Compatible" content="ie=edge" />
@@ -28,5 +13,17 @@
 <link href="https://fonts.googleapis.com/css2?family=Muli:wght@300;400;500;600" rel="stylesheet">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css" />
 
-<!--================= fav-icon =========================-->
+<!--================= fab-icon =========================-->
-<link rel="icon" type="image/png" href="{{ $favicon }}" />
+{{/* add favicon only if the site author has provided the the favicon */}}
+{{ if site.Params.logo.favicon }}
+  {{ $favicon := site.Params.logo.favicon }}
+
+  {{/* resize the favicon. don't resize svg because it is not supported */}}
+  {{ $favicon = resources.Get $favicon }}
+  {{ if and $favicon (ne $favicon.MediaType.SubType "svg") }}
+    {{ $favicon = $favicon.Resize "42x" }}
+  {{ end }}
+  {{ $favicon = $favicon.RelPermalink}}
+
+  <link rel="icon" type="image/png" href="{{ $favicon }}" />
+{{end}}

layouts/partials/helpers/get-author-image.html

@@ -21,7 +21,7 @@
 {{/* apply image processing. don't use "Fit" in svg because its not supported */}}
 {{ $authorImage:= resources.Get $authorImage}}
 {{ if and $authorImage (ne $authorImage.MediaType.SubType "svg") }}
-  {{ $authorImage := $authorImage.Fit "120x120" }}
+  {{ $authorImage = $authorImage.Fit "120x120" }}
 {{ end }}
 
 {{/*  return the author image link  */}}

layouts/partials/navigators/navbar-2.html

@@ -1,28 +1,31 @@
-{{/* default logos  */}}
+{{/* by default, don't use any logo */}}
-{{ $mainLogo := "/images/main-logo.png" }}
+{{ $mainLogo := "" }}
-{{ $invertedLogo := "/images/inverted-logo.png" }}
+{{ $invertedLogo := "" }}
 
-{{/* if custom logo has been provided in the config file, then use them */}}
+{{/*  if custom logo has been provided, use them  */}}
 {{ if site.Params.logo.main }}
   {{ $mainLogo = site.Params.logo.main }}
 {{ end }}
-
 {{ if site.Params.logo.inverted }}
   {{ $invertedLogo = site.Params.logo.inverted }}
 {{ end }}
 
 {{/* resize the logos. don't resize svg because it is not supported */}}
-{{ $mainLogo := resources.Get $mainLogo}}
+{{ if $mainLogo }}
-{{ if and $mainLogo (ne $mainLogo.MediaType.SubType "svg") }}
+  {{ $mainLogo = resources.Get $mainLogo}}
-  {{ $mainLogo = $mainLogo.Resize "42x" }}
+  {{ if and $mainLogo (ne $mainLogo.MediaType.SubType "svg") }}
+    {{ $mainLogo = $mainLogo.Resize "42x" }}
+  {{ end }}
+  {{ $mainLogo = $mainLogo.RelPermalink}}
 {{ end }}
-{{ $mainLogo = $mainLogo.RelPermalink}}
 
-{{ $invertedLogo := resources.Get $invertedLogo}}
+{{ if $invertedLogo }}
-{{ if and $invertedLogo (ne $invertedLogo.MediaType.SubType "svg") }}
+  {{ $invertedLogo = resources.Get $invertedLogo}}
-  {{ $invertedLogo = $invertedLogo.Resize "42x" }}
+  {{ if and $invertedLogo (ne $invertedLogo.MediaType.SubType "svg")}}
+    {{ $invertedLogo = $invertedLogo.Resize "42x" }}
+  {{ end }}
+  {{ $invertedLogo = $invertedLogo.RelPermalink}}
 {{ end }}
-{{ $invertedLogo = $invertedLogo.RelPermalink}}
 
 <nav class="navbar navbar-expand-xl top-navbar final-navbar shadow">
   <div class="container">
@@ -30,7 +33,9 @@
       <span class="navbar-toggler-icon"></span>
     </button>
     <a class="navbar-brand" href="{{ site.BaseURL | relLangURL }}">
-      <img src="{{ $mainLogo  }}" alt="Logo">
+      {{ if $mainLogo }}
+        <img src="{{ $mainLogo  }}" alt="Logo">
+      {{ end }}
       {{- site.Title -}}
     </a>
     <button class="navbar-toggler navbar-light" id="toc-toggler" type="button" onclick="toggleTOC()">
@@ -46,6 +51,10 @@
     </div>
   </div>
   <!-- Store the logo information in a hidden img for the JS -->
-  <img src="{{ $mainLogo  }}" class="d-none" id="main-logo" alt="Logo">
+  {{ if $mainLogo }}
-  <img src="{{ $invertedLogo  }}" class="d-none" id="inverted-logo" alt="Inverted Logo">
+    <img src="{{ $mainLogo }}" class="d-none" id="main-logo" alt="Logo">
+  {{ end }}
+  {{ if $invertedLogo }}
+    <img src="{{ $invertedLogo }}" class="d-none" id="inverted-logo" alt="Inverted Logo">
+  {{ end }}
 </nav>

layouts/partials/navigators/navbar.html

@@ -7,11 +7,11 @@
   {{ $blogEnabled = true }}
 {{ end }}
 
-{{/*  default logos  */}}
+{{/* by default, don't use any logo */}}
-{{ $mainLogo := "/images/main-logo.png" }}
+{{ $mainLogo := "" }}
-{{ $invertedLogo := "/images/inverted-logo.png" }}
+{{ $invertedLogo := "" }}
 
-{{/*  if custom logo is used, them  */}}
+{{/*  if custom logo has been provided, use them  */}}
 {{ if site.Params.logo.main }}
   {{ $mainLogo = site.Params.logo.main }}
 {{ end }}
@@ -20,17 +20,21 @@
 {{ end }}
 
 {{/* resize the logos. don't resize svg because it is not supported */}}
-{{ $mainLogo := resources.Get $mainLogo}}
+{{ if $mainLogo }}
-{{ if and $mainLogo (ne $mainLogo.MediaType.SubType "svg") }}
+  {{ $mainLogo = resources.Get $mainLogo}}
-  {{ $mainLogo = $mainLogo.Resize "42x" }}
+  {{ if and $mainLogo (ne $mainLogo.MediaType.SubType "svg") }}
+    {{ $mainLogo = $mainLogo.Resize "42x" }}
+  {{ end }}
+  {{ $mainLogo = $mainLogo.RelPermalink}}
 {{ end }}
-{{ $mainLogo = $mainLogo.RelPermalink}}
 
-{{ $invertedLogo := resources.Get $invertedLogo}}
+{{ if $invertedLogo }}
-{{ if and $invertedLogo (ne $invertedLogo.MediaType.SubType "svg")}}
+  {{ $invertedLogo = resources.Get $invertedLogo}}
-  {{ $invertedLogo = $invertedLogo.Resize "42x" }}
+  {{ if and $invertedLogo (ne $invertedLogo.MediaType.SubType "svg")}}
+    {{ $invertedLogo = $invertedLogo.Resize "42x" }}
+  {{ end }}
+  {{ $invertedLogo = $invertedLogo.RelPermalink}}
 {{ end }}
-{{ $invertedLogo = $invertedLogo.RelPermalink}}
 
 {{ $customMenus := site.Params.customMenus }}
 {{ if (index site.Data site.Language.Lang).site.customMenus }}
@@ -45,7 +49,9 @@
 <nav class="navbar navbar-expand-xl top-navbar initial-navbar" id="top-navbar">
   <div class="container">
     <a class="navbar-brand" href="{{ site.BaseURL | relLangURL }}">
-      <img src="{{ $invertedLogo }}" id="logo" alt="Logo">
+      {{ if $invertedLogo }}
+        <img src="{{ $invertedLogo }}" id="logo" alt="Logo">
+      {{ end }}
       {{- site.Title -}}
     </a>
     <button
@@ -119,6 +125,10 @@
     </div>
   </div>
   <!-- Store the logo information in a hidden img for the JS -->
-  <img src="{{ $mainLogo }}" class="d-none" id="main-logo" alt="Logo">
+  {{ if $mainLogo }}
-  <img src="{{ $invertedLogo }}" class="d-none" id="inverted-logo" alt="Inverted Logo">
+    <img src="{{ $mainLogo }}" class="d-none" id="main-logo" alt="Logo">
+  {{ end }}
+  {{ if $invertedLogo }}
+    <img src="{{ $invertedLogo }}" class="d-none" id="inverted-logo" alt="Inverted Logo">
+  {{ end }}
 </nav>

layouts/partials/sections/home.html

@@ -26,7 +26,7 @@
   {{ $authorImage = $author.image }}
 {{ end }}
 {{ $authorImage := resources.Get $authorImage }}
-{{ $authorImage := $authorImage.Fit "148x148" }}
+{{ $authorImage = $authorImage.Fit "148x148" }}
 
 {{/* get file that matches the filename as specified as src="" in shortcode */}}
 {{ $src := resources.Get $backgroundImage }}

static/css/sections/skills.css

@@ -19,6 +19,7 @@
 .skills-section .card {
   margin-top: 0.5rem;
   margin-bottom: 0.5rem;
+  height: 100%;
 }
 
 .skills-section .card .card-body {

static/js/home.js

@@ -63,28 +63,6 @@ var projectCards;
       }
     }
 
-    // ==================== Adjust height of the skills card =============
-    function adjustSkillCardsHeight() {
-      if (!isMobile) { // no need to adjust height for mobile devices
-        // primary skills
-        var skillCards = document.getElementById("primary-skills");
-        if (skillCards != null) {
-          var cardElems = skillCards.getElementsByClassName("card");
-          var maxHeight = 0;
-          for (let i = 0; i < cardElems.length; i++) {
-            if (cardElems.item(i).clientHeight > maxHeight) {
-              maxHeight = cardElems.item(i).clientHeight;
-            }
-          }
-          for (let i = 0; i < cardElems.length; i++) {
-            cardElems.item(i).setAttribute("style", "min-height: " + maxHeight + "px;");
-          }
-        }
-      }
-    }
-    $(window).on("load", function () {
-      adjustSkillCardsHeight();
-    });
 
     // ================== Project cards =====================
     // Add click action on project category selector buttons
@@ -331,13 +309,13 @@ var projectCards;
           this.parentElement.classList.toggle("col-sm-12");
           if (this.children["SmallImage"].hasAttribute("active")) {
             let mainLogo = this.children["LargeImage"].getAttribute("Style");
-            this.children["LargeImage"].setAttribute("active",true);
+            this.children["LargeImage"].setAttribute("active", true);
             this.children["SmallImage"].removeAttribute("active");
 
             this.setAttribute("Style", mainLogo);
           } else {
             let mainLogo = this.children["SmallImage"].getAttribute("Style");
-            this.children["SmallImage"].setAttribute("active",true);
+            this.children["SmallImage"].setAttribute("active", true);
             this.children["LargeImage"].removeAttribute("active");
             this.setAttribute("Style", mainLogo);
           }

static/js/navbar.js

@@ -16,8 +16,12 @@
         $('#navbar-toggler').addClass('navbar-light');
 
         // get the main logo from hidden img tag
-        let mainLogo = document.getElementById("main-logo").getAttribute("src");
+        let mainLogo = document.getElementById("main-logo")
-        $('#logo').attr("src", mainLogo);
+        if (mainLogo !== null) {
+          let logoURL = mainLogo.getAttribute("src");
+          $('#logo').attr("src", logoURL);
+        }
+
       } else {
         $('#top-navbar').removeClass('final-navbar shadow');
         $('#top-navbar').addClass('initial-navbar');
@@ -26,8 +30,11 @@
         $('#navbar-toggler').addClass('navbar-dark');
 
         // get the inverted logo from hidden img tag
-        let invertedLogo = document.getElementById("inverted-logo").getAttribute("src");
+        let invertedLogo = document.getElementById("inverted-logo")
-        $('#logo').attr("src", invertedLogo);
+        if (invertedLogo !== null) {
+          let logoURL = invertedLogo.getAttribute("src");
+          $('#logo').attr("src", logoURL);
+        }
       }
     });