1 files changed, 36 insertions, 32 deletions
diff --git a/themes/default/layouts/partials/navigator-middle.html b/themes/default/layouts/partials/navigator-middle.html
index 46c4060..7259b43 100644
--- a/themes/default/layouts/partials/navigator-middle.html
+++ b/themes/default/layouts/partials/navigator-middle.html
@@ -1,22 +1,29 @@
-{{ $id   := .Id   }}
-{{ $href := .Href }}
+{{- $href := or .Href "#" -}}
+{{- $id := or .Id "top" -}}
+{{- $label := title $id -}}
+{{- $icon := readFile (print (partial "function-paths.html").static "/icons/feather/arrow-up.svg") -}}
+{{- $refresh := readFile (print (partial "function-paths.html").static "/icons/feather/refresh-cw.svg") -}}
+
+{{- with .Icon -}}
+  {{- $icon = readFile (print (partial "function-paths.html").static "/icons/feather/" . ".svg") -}}
+{{- end -}}
+
+{{- with .IconLabel -}}
+  {{- $label = . -}}
+{{- end -}}
 
 <nav>
   <icon-button>
     <a
-      id="{{ or $id "top" }}"
-      href="{{ or $href "#" }}"
+      data-update=""
+      id="{{ $id }}"
+      href="{{ $href }}"
+      target="_self"
      >
-      {{ with .Icon }}
-        {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/" . ".svg")) }}
-      {{ else }}
-        {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-up.svg")) }}
-      {{ end }}
-      {{ with .IconLabel }}
-        <small>{{ . }}</small>
-      {{ else }}
-        <small>Top</small>
-      {{ end }}
+      {{ safeHTML $icon }}
+      {{ safeHTML $refresh }}
+      <small>{{ $label }}</small>
+      <small>Update</small>
     </a>
   </icon-button>
 
@@ -31,7 +38,7 @@
 
   {{ if .Context.Site.Menus.main }}
     {{ range .Context.Site.Menus.main }}
-    <icon-navigator hidden>
+    <icon-navigator hidden="">
       <icon-button>
           <a id="nav-middle-{{ path.Base .Identifier }}" href="{{ .URL | absURL }}">
             {{ with .Identifier }}
@@ -45,27 +52,24 @@
     {{ end }}
   {{ end }}
 
-  <search-entry id="search-frame">
-    <form
-      id="search-form"
-      action="https://lite.duckduckgo.com/lite/">
-      <input required
-        id="search-input"
-        name="q"
-        value=""
-        type="search"
-        autocomplete="off"
-        spellcheck="false"
+  <search-box>
+    <form role="search" action="https://lite.duckduckgo.com/lite/">
+      <input
         aria-autocomplete="list"
         aria-label="search input"
+        autocomplete="off"
+        id="search"
+        name="q"
+        required=""
+        spellcheck="false"
+        type="search"
+        value=""
       />
-      <button id="search-submit">
+      <button type="submit">
         {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/search.svg")) }}
         <small>Search</small>
       </button>
-      <ul hidden id="search-results"></ul>
+      <ul hidden=""></ul>
     </form>
-   </search-entry>
- </nav>
-
-<navigation-separator><hr hidden></navigation-separator>
+ </search-box>
+</nav>