Merge branch 'develop' into feat/feature-flags

f-eld-ch · Oct 29, 2024 · 232d544 · 232d544
2 parents 9097f23 + e571e7c
commit 232d544
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [unreleased]
 
+### 🐛 Bug Fixes
+
+- *(ui)* Navbar dropdowns should better align with main navbar ([#485](https://github.com/f-eld-ch/sitrep/issues/485)) - ([3ad0a37](https://github.com/f-eld-ch/sitrep/commit/3ad0a371cc92bba0ee41bf580f0bd17d04b052c5))
+
 ### 📚 Documentation
 
 - Adjust licsense to use AGPLv3 ([#470](https://github.com/f-eld-ch/sitrep/issues/470)) - ([eeac052](https://github.com/f-eld-ch/sitrep/commit/eeac052a060924ae20bf1742a907ee6f4c0e12c9))

diff --git a/ui/src/components/Navbar.tsx b/ui/src/components/Navbar.tsx
@@ -74,7 +74,7 @@ const Navbar: FunctionComponent<{ isActive?: boolean }> = ({ isActive = false })
                 <span>{t("incident")}</span>
               </span>
             </NavLink>
-            <div className="navbar-dropdown is-boxed">
+            <div className="navbar-dropdown">
               <NavLink className={({ isActive }) => "navbar-item" + (isActive ? " is-active" : "")} to="/incident/list">
                 {t("overview")}
               </NavLink>
@@ -196,7 +196,7 @@ function UserNavBar() {
       <div className="navbar-link">
         <FontAwesomeIcon icon={faCog} />
       </div>
-      <div className="navbar-dropdown is-boxed is-right">
+      <div className="navbar-dropdown is-right">
         <VersionNavBar />
         <div className="navbar-item">
           <span className="icon-text is-flex-wrap-nowrap">
@@ -259,7 +259,7 @@ const JournalNavBar: FunctionComponent = () => {
           <span>{t("journal")}</span>
         </span>
       </NavLink>
-      <div className="navbar-dropdown is-boxed">
+      <div className="navbar-dropdown">
         <NavLink
           className={({ isActive }) => "navbar-item is-capitalized" + (isActive ? " is-active" : "")}
           end={true}
@@ -308,7 +308,7 @@ const TasksNavBar: FunctionComponent = () => {
           <span>{t("tasksRequestOrders")}</span>
         </span>
       </NavLink>
-      <div className="navbar-dropdown is-boxed">
+      <div className="navbar-dropdown">
         <NavLink
           className={({ isActive }) => "navbar-item" + (isActive ? " is-active" : "")}
           to={`/incident/${incidentId}/tasks`}