Merge pull request #1007 from kecnry/app-bar-styling

update colors of top toolbar and import button
spacetelescope · Dec 15, 2021 · f26a213 · f26a213
2 parents 1adbbd8 + bdc246b
commit f26a213
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/jdaviz/app.vue b/jdaviz/app.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="web-app" class="jdaviz">
-    <v-app-bar color="primary" dark :dense="state.settings.dense_toolbar" flat app absolute clipped-right>
+    <v-app-bar color="toolbar" dark :dense="state.settings.dense_toolbar" flat app absolute clipped-right>
       <v-toolbar-items v-for="item in state.tool_items">
         <v-divider v-if="['g-data-tools', 'g-subset-tools'].indexOf(item.name) === -1" vertical style="margin: 0px 10px"></v-divider>
         <v-divider v-else-if="item.name === 'g-subset-tools'" vertical style="margin: 0px 10px; border-width: 0"></v-divider>
@@ -102,18 +102,22 @@ export default {
   },
   created() {
     this.$vuetify.theme.themes.light = {
+      toolbar: "#153A4B",
       primary: "#00617E",
       secondary: "#007DA4",
       accent: "#C75109",
+      turquoise: "#007BA1",
       error: '#FF5252',
       info: '#2196F3',
       success: '#4CAF50',
       warning: '#FFC107',
     };
     this.$vuetify.theme.themes.dark = {
+      toolbar: "#153A4B",
       primary: "#00617E",
       secondary: "#007DA4",
       accent: "#C75109",
+      turquoise: "#007BA1",
       error: '#FF5252',
       info: '#2196F3',
       success: '#4CAF50',

diff --git a/jdaviz/configs/default/plugins/data_tools/data_tools.vue b/jdaviz/configs/default/plugins/data_tools/data_tools.vue
@@ -2,7 +2,7 @@
   <v-toolbar-items>
     <v-dialog v-model="dialog" height="400" width="600">
       <template v-slot:activator="{ on }">
-        <v-btn tile depressed v-on="on" color="accent">
+        <v-btn tile depressed v-on="on" color="turquoise">
           Import
           <v-icon right>mdi-plus</v-icon>
         </v-btn>