From f38cff15e4444d2c9eba80fe1b57fe72230d53c0 Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Mon, 31 Jan 2022 20:30:39 -0600
Subject: [PATCH] minor search tweaks

---
 assets/sass/_custom.sass     |  4 ++--
 i18n/en.toml                 |  2 +-
 layouts/partials/header.html | 39 ++++++++++++++++++++++++++++++++++++
 layouts/partials/nav.html    | 39 ------------------------------------
 4 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 layouts/partials/header.html
 delete mode 100644 layouts/partials/nav.html

diff --git a/assets/sass/_custom.sass b/assets/sass/_custom.sass
index 572113f..b2cced8 100644
--- a/assets/sass/_custom.sass
+++ b/assets/sass/_custom.sass
@@ -8,13 +8,13 @@ html, body
         img
             max-height: 2rem
     // search box
-    &-item
+    &_search
         display: grid
         align-items: center
         .search
             @media screen and (min-width: 992px)
                 margin-right: 1.5rem
-
+                
 
 // Magic for collapsing content, borrowed from https://www.digitalocean.com/community/tutorials/css-collapsible
 .lbl-toggle
diff --git a/i18n/en.toml b/i18n/en.toml
index 5cfd87a..704fa79 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -20,7 +20,7 @@ other = "View source"
 other = "No matches found"
 
 [quick_links]
-other = "Quick links"
+other = "Quick results"
 
 [search_field_placeholder]
 other = "Search"
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
new file mode 100644
index 0000000..8aec3ac
--- /dev/null
+++ b/layouts/partials/header.html
@@ -0,0 +1,39 @@
+{{- $params := .Site.Params }}
+{{- $centerLogo := $params.centerLogo }}
+{{ $logo := $params.logo }}
+<header class="nav_header" >
+  <nav class="nav">
+    {{- if $centerLogo }}
+      {{- partialCached "logo" (dict "logo" $logo "class" "nav_hide") }}
+    {{- else }}
+      {{- partialCached "logo" (dict "logo" $logo) }}
+    {{- end }}
+    <div class='nav_body nav_body_{{ default "left" $params.mobileNavigation }}'>
+      {{ $context := . }}
+      {{ $menuData := .Site.Data.menu }}
+      {{ with $menuData }}
+        {{ partial "nav" (dict "context" $context "menu" $menuData) }}
+      {{- else }}
+        {{ partial "nav" (dict "context" . "menu" .Site.Menus.main) }}
+      {{- end }}
+      {{ if .Site.IsMultiLingual }}
+      <div class="nav_parent">
+        <a href="#" class="nav_item">{{ $params.languageMenuName }}</a>
+        <div class="nav_sub">
+          <span class="nav_child"></span>
+          {{ range .Site.Home.AllTranslations }}
+          <a href="{{ .Permalink }}" class="nav_child nav_item">{{ .Language.LanguageName }}</a>
+          {{ end }}
+        </div>
+      </div>
+      {{- end }}
+      {{- if $centerLogo }}
+        {{- partial "logo" (dict "logo" $logo "class" "nav_center") }}
+      {{- end }}
+      <li class="nav_search">
+        {{- partial "search" . }}
+      </li>
+      {{- partialCached "follow" . }}
+    </div>
+  </nav>
+</header>
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
deleted file mode 100644
index e854819..0000000
--- a/layouts/partials/nav.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- $menu := .menu }}
-{{ $menuData := .context.Site.Data.menu }}
-{{- $link := .context.Permalink }}
-{{- $url := "" }}
-{{- $name := "" }}
-{{- $forwardSlash := "/" }}
-{{- $children := false }}
-{{- range $menu }}
-  {{- if eq $menu $menuData }}
-    {{- $children = .submenu }}
-    {{- $name = .name }}
-    {{- $url = absURL .link }}
-  {{- else }}
-    {{- $children = .Children }}
-    {{- $name = .Name }}
-    {{- $url = absLangURL .URL }}
-  {{- end }}
-  <div class="nav_parent{{ if (and (not .Children) (eq (trim $url $forwardSlash) (trim $link $forwardSlash))) }} nav_active{{ end}}">
-    <a href="{{ $url }}" class="nav_item" title="{{ $name }}">{{ $name }} {{ with $children }}<img src='{{ absURL "icons/caret-icon.svg" }}' alt="icon" class="nav_icon">{{ end }}</a>
-    {{- with $children }}
-    <div class="nav_sub">
-      <span class="nav_child"></span>
-      {{- range . }}
-        {{- if eq $menu $menuData }}
-          {{- $name = .name }}
-          {{- $url = absURL .link }}
-        {{- else }}
-          {{- $name = .Name }}
-          {{- $url = absLangURL .URL }}
-        {{- end }}
-        <a href="{{ $url }}" class="nav_child nav_item" title="{{ $name }}">{{ $name }}</a>
-      {{- end }}
-    </div>
-    {{- end }}
-  </div>
-{{- end }}
-<li class="nav-item">
-  {{- partial "search" . }}
-</li>
\ No newline at end of file