From e7cd5e9ab03fea5c59bfc874a6562900ce3efbfd Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@lastzero.net>
Date: Wed, 20 Jan 2021 13:12:11 +0100
Subject: [PATCH] Frontend: Navigation code clean-up

---
 frontend/src/component/navigation.vue | 16 ++++++++--------
 frontend/src/share/navigation.vue     |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/frontend/src/component/navigation.vue b/frontend/src/component/navigation.vue
index c186f1301..4cafc2676 100644
--- a/frontend/src/component/navigation.vue
+++ b/frontend/src/component/navigation.vue
@@ -1,8 +1,8 @@
 <template>
   <div id="p-navigation">
     <template v-if="$vuetify.breakpoint.smAndDown || !auth">
-      <v-toolbar dark :dense="$vuetify.breakpoint.smAndDown" fixed flat color="navigation darken-1" class="nav-small"
-                 scroll-off-screen @click.stop="showNavigation()">
+      <v-toolbar dark fixed flat scroll-off-screen :dense="$vuetify.breakpoint.smAndDown"  color="navigation darken-1" class="nav-small"
+                  @click.stop="showNavigation()">
 
         <v-toolbar-side-icon v-if="auth" class="nav-show"></v-toolbar-side-icon>
 
@@ -16,7 +16,7 @@
         </v-btn>
 
       </v-toolbar>
-      <v-toolbar dark :dense="$vuetify.breakpoint.smAndDown" flat color="navigation darken-1">
+      <v-toolbar dark flat :dense="$vuetify.breakpoint.smAndDown" color="#fafafa">
       </v-toolbar>
     </template>
     <v-navigation-drawer
@@ -72,7 +72,7 @@
         </v-list-tile>
 
         <v-list-group v-if="!isMini" prepend-icon="image_search" no-action>
-          <template v-slot:activator>
+          <template #activator>
             <v-list-tile to="/browse" class="nav-browse" @click.stop="">
               <v-list-tile-content>
                 <v-list-tile-title>
@@ -148,7 +148,7 @@
         </v-list-tile>
 
         <v-list-group v-if="!isMini && $config.feature('albums')" prepend-icon="photo_album" no-action>
-          <template v-slot:activator>
+          <template #activator>
             <v-list-tile to="/albums" class="nav-albums" @click.stop="">
               <v-list-tile-content>
                 <v-list-tile-title>
@@ -250,7 +250,7 @@
         </v-list-tile>
 
         <v-list-group v-if="!isMini" v-show="$config.feature('places')" prepend-icon="place" no-action>
-          <template v-slot:activator>
+          <template #activator>
             <v-list-tile to="/places" class="nav-places" @click.stop="">
               <v-list-tile-content>
                 <v-list-tile-title>
@@ -313,7 +313,7 @@
         </v-list-tile>
 
         <v-list-group v-if="!isMini && $config.feature('library')" prepend-icon="camera_roll" no-action>
-          <template v-slot:activator>
+          <template #activator>
             <v-list-tile to="/library" class="nav-library" @click.stop="">
               <v-list-tile-content>
                 <v-list-tile-title>
@@ -364,7 +364,7 @@
           </v-list-tile>
 
           <v-list-group v-else prepend-icon="settings" no-action>
-            <template v-slot:activator>
+            <template #activator>
               <v-list-tile to="/settings" class="nav-settings" @click.stop="">
                 <v-list-tile-content>
                   <v-list-tile-title>
diff --git a/frontend/src/share/navigation.vue b/frontend/src/share/navigation.vue
index 5cbe0b4f6..a8dac559f 100644
--- a/frontend/src/share/navigation.vue
+++ b/frontend/src/share/navigation.vue
@@ -1,7 +1,6 @@
 <template>
   <div id="p-navigation">
-    <v-toolbar dark fixed flat color="navigation darken-1" class="nav-small"
-               :dense="$vuetify.breakpoint.smAndDown" scroll-off-screen>
+    <v-toolbar dark fixed flat scroll-off-screen :dense="$vuetify.breakpoint.smAndDown" color="navigation darken-1" class="nav-small">
       <v-toolbar-title>
         <button @click.stop.prevent="goHome">
           {{ page.title }}
@@ -17,7 +16,7 @@
         <img src="/static/img/logo-white.svg" alt="Logo">
       </v-avatar>
     </v-toolbar>
-    <v-toolbar dark flat :dense="$vuetify.breakpoint.smAndDown" color="navigation darken-1">
+    <v-toolbar dark flat :dense="$vuetify.breakpoint.smAndDown" color="#fafafa">
     </v-toolbar>
     <div id="photoprism-info"><a href="https://photoprism.app/" target="_blank">Shared with PhotoPrism</a></div>
   </div>