From c971faeb205dce1b21aa4caf11de996d6f515409 Mon Sep 17 00:00:00 2001
From: BBaoVanC <bbaovanc@bbaovanc.com>
Date: Mon, 20 Mar 2023 18:37:47 -0500
Subject: [PATCH] Clean up navbar structure

---
 assets/css/bobastyle.css     | 20 ++++++--------------
 layouts/_default/baseof.html |  4 +---
 layouts/partials/top.html    | 28 +++++++++++++---------------
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/assets/css/bobastyle.css b/assets/css/bobastyle.css
index d9553b2..ddd8e0f 100644
--- a/assets/css/bobastyle.css
+++ b/assets/css/bobastyle.css
@@ -383,25 +383,17 @@ h1 svg.icon {
 
 /* Navbar formatting {{{ */
 
-.topbar {
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: row;
-  background-color: var(--background-1);
-  color: var(--text-1);
-  border-radius: 8px;
-  margin-top: 5px;
-  padding: 4px;
-  align-items: flex-start;
-}
-
 .navbar {
   display: flex;
   flex-grow: 1;
   overflow: auto;
+  background-color: var(--background-1);
+  border-radius: 8px;
+  margin-top: 5px;
+  padding: 4px;
 }
 
-.navbar a {
+.navbar-item {
   padding: 8px 12px;
   border-radius: 12px;
   white-space: nowrap;
@@ -412,7 +404,7 @@ h1 svg.icon {
   text-decoration: none;
 }
 
-.topbar .active {
+.navbar-item.active {
   font-weight: bold;
 }
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 671286e..4dabd0f 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -10,9 +10,7 @@
 
         <a id="top" name="top" aria-hidden="true"></a>
 
-        <div class="top">
-            {{ partial "top.html" . }}
-        </div>
+        {{ partial "top.html" . }}
 
         {{ if not .IsHome }}
             {{ partial "breadcrumb.html" . }}
diff --git a/layouts/partials/top.html b/layouts/partials/top.html
index fca6c12..8a2d9cf 100644
--- a/layouts/partials/top.html
+++ b/layouts/partials/top.html
@@ -4,20 +4,18 @@
     </a>
 </header>
 
-<div class="topbar">
-    <nav class="navbar" aria-label="{{ i18n "aria_navbar" }}">
-        {{ with .Site.Home }}
-            <a class="navbar-item{{ if $.IsHome }} active{{ end }}" href="{{ .Permalink | absLangURL }}">{{ .Title | markdownify }}</a>
-        {{ end }}
+<nav class="navbar" aria-label="{{ i18n "aria_navbar" }}">
+    {{ with .Site.Home }}
+        <a class="navbar-item{{ if $.IsHome }} active{{ end }}" href="{{ .Permalink | absLangURL }}">{{ .Title | markdownify }}</a>
+    {{ end }}
 
-        {{ range .Site.Menus.main }}
-            {{ $isActive := false }}
-            {{ if or ($.HasMenuCurrent .Menu .) ($.IsMenuCurrent .Menu .) }}
-                {{ $isActive = true }}
-            {{ end }}
-            <a class="navbar-item{{ if $isActive }} active{{ end }}"
-               {{ if strings.HasPrefix .URL "http" }}target="_blank" rel="noopener"{{ end }}
-               href="{{ .URL }}">{{ .Name }}</a>
+    {{ range .Site.Menus.main }}
+        {{ $isActive := false }}
+        {{ if or ($.HasMenuCurrent .Menu .) ($.IsMenuCurrent .Menu .) }}
+            {{ $isActive = true }}
         {{ end }}
-    </nav>
-</div>
+        <a class="navbar-item{{ if $isActive }} active{{ end }}"
+           {{ if strings.HasPrefix .URL "http" }}target="_blank" rel="noopener"{{ end }}
+           href="{{ .URL }}">{{ .Name }}</a>
+    {{ end }}
+</nav>