Merge pull request #2648 from kecnry/top-bar-alignment

fix top app bar style to align in notebook, popout, and mast
spacetelescope · Jan 5, 2024 · ee4320a · ee4320a
2 parents 6372879 + e511836
commit ee4320a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -78,6 +78,8 @@ Other Changes and Additions
 Bug Fixes
 ---------
 
+* Fix app top-bar alignment in popouts and when embedded in websites. [#2648]
+
 Cubeviz
 ^^^^^^^
 

diff --git a/jdaviz/app.vue b/jdaviz/app.vue
@@ -35,7 +35,7 @@
         </v-row>
       </div>
     </v-overlay>
-    <v-app-bar color="toolbar" dark :dense="state.settings.dense_toolbar" flat app absolute clipped-right style="margin-left: 1px; margin-right: 1px">
+    <v-app-bar color="toolbar" dark :dense="state.settings.dense_toolbar" flat app absolute clipped-right :style="checkNotebookContext() ? 'margin-left: 1px; margin-right: 1px' : ''">
       <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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,6 +78,8 @@ Other Changes and Additions @@
     Bug Fixes
     ---------
+    * Fix app top-bar alignment in popouts and when embedded in websites. [#2648]
     Cubeviz
     ^^^^^^^
@@ Expand Down @@