Merge branch 'main' of https://github.com/hugo-toha/toha into main

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-pages.html

@@ -0,0 +1,10 @@
+{{ $pages:= slice}}
+{{ range . }}
+    {{ if .HasChildren }}
+        {{ $nestedPages:=partial "helpers/get-pages.html" .Children }}
+        {{ $pages = $pages | append $nestedPages }}
+    {{ else }}
+        {{ $pages = $pages | append .Page }}
+    {{ end }}
+{{ end }}
+{{ return $pages}}

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/navigators/next-prev-navigator.html

@@ -1,33 +1,39 @@
+{{ $curPage := . }}
+{{ $prevPage := "" }}
+{{ $nextPage := "" }}
+
+<!-- List all the pages. It uses the sidebar menu to discover the page order. -->
+{{ $pages := partial "helpers/get-pages.html" site.Menus.sidebar }}
+
+<!-- Now, find the current page index in the pages list. Then, find previous page and next page. -->
+{{ $idx := 0 }}
+{{ range $pages }}
+  {{ if eq .RelPermalink $curPage.RelPermalink }}
+    {{ $prevPage = index $pages (sub $idx 1) }}
+    {{ $nextPage = index $pages (add $idx 1) }}
+  {{ end }}
+  {{ $idx = add $idx 1 }}
+{{ end }}
+
 <div class="row next-prev-navigator">
-{{ $currentPage := . }}
+  {{ if $prevPage }}
-{{ range (where site.RegularPages.ByDate "Type" "in" site.Params.mainSections )}}
+    <div class="col-md-6 previous-article">
-  {{ if eq .RelPermalink  $currentPage.RelPermalink }}
+      <a href="{{ $prevPage.RelPermalink }}" title="{{ $prevPage.Title }}" class="btn btn-outline-info">
-    {{ if .Next }}
+        <div><i class="fas fa-chevron-circle-left"></i> {{ i18n "prev" }}</div>
-      {{ if (in site.Params.mainSections .Next.Type) }}
+        <div class="next-prev-text">{{ $prevPage.Title }}</div>
-      <div class="col-md-6 previous-article">
+      </a>
-        <a href="{{.Next.RelPermalink}}" title="{{ .Next.Title }}" class="btn btn-outline-info">
+    </div>
-          <div><i class="fas fa-chevron-circle-left"></i> {{ i18n "prev" }}</div>
+  {{ end }}
-          <div class="next-prev-text">{{ .Next.Title }}</div>
+  {{ if $nextPage }}
+      {{ $columnWidth:="col-md-12" }}
+      {{ if $prevPage }}
+        {{ $columnWidth = "col-md-6" }}
+      {{ end}}
+      <div class="{{ $columnWidth }} next-article">
+        <a href="{{ $nextPage.RelPermalink }}" title="{{ $nextPage.Title }}" class="btn btn-outline-info">
+          <div>{{ i18n "next" }} <i class="fas fa-chevron-circle-right"></i></div>
+          <div class="next-prev-text">{{ $nextPage.Title }}</div>
         </a>
       </div>
-      {{ end }}
     {{ end }}
-    {{ if .Prev }}
-      {{ if (in site.Params.mainSections .Prev.Type)  }}
-        {{ $columnWidth:="col-md-12" }}
-        {{ if .Next }}
-          {{ if (in site.Params.mainSections .Next.Type) }}
-              {{ $columnWidth = "col-md-6" }}
-          {{ end }}
-        {{ end}}
-        <div class="{{ $columnWidth }} next-article">
-          <a href="{{ .Prev.RelPermalink }}" title="{{ .Prev.Title }}" class="btn btn-outline-info">
-            <div>{{ i18n "next" }} <i class="fas fa-chevron-circle-right"></i></div>
-            <div class="next-prev-text">{{ .Prev.Title }}</div>
-          </a>
-        </div>
-      {{ end }}
-    {{ end }}
-  {{ end }}
-{{ end }}
 </div>

static/css/layouts/main.css

@@ -432,16 +432,29 @@ mark {
   code {
     padding: 0px;
   }
+
+  h1 {
+    font-size: 2.2rem;
+  }
 }
 
 /* iPhoneX, iPhone 6,7,8 */
 @media only screen and (max-width: 375px) {
+  h1 {
+    font-size: 2rem;
+  }
 }
 
 /* Galaxy S5, Moto G4 */
 @media only screen and (max-width: 360px) {
+  h1 {
+    font-size: 1.8rem;
+  }
 }
 
 /* iPhone 5 or before */
 @media only screen and (max-width: 320px) {
+  h1 {
+    font-size: 1.5rem;
+  }
 }

static/css/sections/about.css

@@ -496,11 +496,24 @@
   .about-section.container {
     max-width: 100%;
   }
+  
+  .circular-progress {
+    width: 135px;
+    height: 135px;
+  }
 }
 
 /* Small devices (landscape phones, 576px and up) */
 
 @media only screen and (max-width: 576px) {
+  .circular-progress {
+    width: 150px;
+    height: 150px;
+  }
+
+  .circular-progress .circular-progress-value {
+    font-size: 1rem;
+  }
 }
 
 /* iPhoneX, iPhone 6,7,8 */
@@ -513,4 +526,12 @@
 
 /* iPhone 5 or before */
 @media only screen and (max-width: 320px) {
+  .col-6 {
+    flex: auto;
+    max-width: 100%;
+  }
+
+  .social-link {
+    flex-wrap: wrap;
+  }
 }

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 {
@@ -57,7 +58,7 @@
     padding-right: 0;
   }
   .skills-section .container {
-    max-width: 100%;
+    max-width: 95%;
   }
 }
 

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);
+        }
       }
     });