Disable logo by default + add logo only if the user provide it

* Disable logo by default, allow to enable with params.logo.enable * Don't default logo into theme logo Signed-off-by: hossainemruz <[email protected]> * add missing comma Signed-off-by: hossainemruz <[email protected]> * Remove unnecessary changes Signed-off-by: hossainemruz <[email protected]> Co-authored-by: Johannes Lippmann <[email protected]> Co-authored-by: hossainemruz <[email protected]>
khannmb · Jun 5, 2021 · 08a09d5 · 08a09d5
1 parent 88a0814
commit 08a09d5
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 52 deletions.
diff --git a/layouts/partials/header.html b/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 =========================-->
-<link rel="icon" type="image/png" href="{{ $favicon }}" />
+<!--================= fab-icon =========================-->
+{{/* 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}}
diff --git a/layouts/partials/navigators/navbar-2.html b/layouts/partials/navigators/navbar-2.html
@@ -1,36 +1,41 @@
-{{/* default logos  */}}
-{{ $mainLogo := "/images/main-logo.png" }}
-{{ $invertedLogo := "/images/inverted-logo.png" }}
+{{/* by default, don't use any logo */}}
+{{ $mainLogo := "" }}
+{{ $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 and $mainLogo (ne $mainLogo.MediaType.SubType "svg") }}
- {{ $mainLogo = $mainLogo.Resize "42x" }}
+{{ if $mainLogo }}
+ {{ $mainLogo = resources.Get $mainLogo}}
+ {{ 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 and $invertedLogo (ne $invertedLogo.MediaType.SubType "svg") }}
- {{ $invertedLogo = $invertedLogo.Resize "42x" }}
+{{ if $invertedLogo }}
+ {{ $invertedLogo = resources.Get $invertedLogo}}
+ {{ 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">
  <button class="navbar-toggler navbar-light" id="sidebar-toggler" type="button" onclick="toggleSidebar()">
  <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">
- <img src="{{ $invertedLogo }}" class="d-none" id="inverted-logo" alt="Inverted Logo">
+ {{ if $mainLogo }}
+ <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>
diff --git a/layouts/partials/navigators/navbar.html b/layouts/partials/navigators/navbar.html
@@ -7,11 +7,11 @@
  {{ $blogEnabled = true }}
 {{ end }}
 
-{{/* default logos  */}}
-{{ $mainLogo := "/images/main-logo.png" }}
-{{ $invertedLogo := "/images/inverted-logo.png" }}
+{{/* by default, don't use any logo */}}
+{{ $mainLogo := "" }}
+{{ $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 and $mainLogo (ne $mainLogo.MediaType.SubType "svg") }}
- {{ $mainLogo = $mainLogo.Resize "42x" }}
+{{ if $mainLogo }}
+ {{ $mainLogo = resources.Get $mainLogo}}
+ {{ 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 and $invertedLogo (ne $invertedLogo.MediaType.SubType "svg")}}
- {{ $invertedLogo = $invertedLogo.Resize "42x" }}
+{{ if $invertedLogo }}
+ {{ $invertedLogo = resources.Get $invertedLogo}}
+ {{ 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">
- <img src="{{ $invertedLogo }}" class="d-none" id="inverted-logo" alt="Inverted Logo">
+ {{ if $mainLogo }}
+ <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>
diff --git a/static/js/navbar.js b/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");
- $('#logo').attr("src", mainLogo);
+ let mainLogo = document.getElementById("main-logo")
+ 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");
- $('#logo').attr("src", invertedLogo);
+ let invertedLogo = document.getElementById("inverted-logo")
+ if (invertedLogo !== null) {
+ let logoURL = invertedLogo.getAttribute("src");
+ $('#logo').attr("src", logoURL);
+ }
  }
  });