From d995e4d14d4457166944ac645b2106e8ba8da431 Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Sat, 4 Jan 2020 18:00:33 +0000
Subject: [PATCH] fix: 0cc80f90eebc1fc44eb3540b05260fdce5e517a4

Fix logo in navbar transforming into site title on mobile.

See #1439
Fix #1507
---
 layouts/partials/navbar.html | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index e7d2d48d..f50da6ff 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,14 +1,20 @@
 {{ $current_page := . }}
+
+{{/* Get site logo. */}}
 {{ $show_logo := site.Params.main_menu.show_logo | default true }}
+{{ $has_logo := fileExists "assets/images/logo.png" }}
+{{ $logo := "" }}
+{{ if $has_logo }}
+  {{ $logo = (partial "functions/get_logo" (dict "constraint" "max_height" "size" 70)) }}
+{{ end }}
+
 <nav class="navbar navbar-expand-lg navbar-light compensate-for-scrollbar" id="navbar-main">
   <div class="container">
 
     {{if $show_logo}}
-    {{ $has_logo := fileExists "assets/images/logo.png" }}
     <div class="d-none d-lg-inline-flex">
       <a class="navbar-brand" href="{{ "/" | relLangURL }}">
         {{- if $has_logo -}}
-          {{ $logo := (partial "functions/get_logo" (dict "constraint" "max_height" "size" 70)) }}
           <img src="{{ $logo.RelPermalink }}" alt="{{ site.Title }}">
         {{- else -}}
           {{- site.Title -}}
@@ -27,10 +33,10 @@
     {{if $show_logo}}
     <div class="navbar-brand-mobile-wrapper d-inline-flex d-lg-none">
       <a class="navbar-brand" href="{{ "/" | relLangURL }}">
-      {{- if site.Params.logo -}}
-      <img src="{{ printf "/img/%s" site.Params.logo | relURL }}" alt="{{ site.Title }}">
+      {{- if $has_logo -}}
+        <img src="{{ $logo.RelPermalink }}" alt="{{ site.Title }}">
       {{- else -}}
-      {{- site.Title -}}
+        {{- site.Title -}}
       {{- end -}}
       </a>
     </div>