Merge pull request #2650 from meeseeksmachine/auto-backport-of-pr-264…

…8-on-v3.8.x Backport PR #2648 on branch v3.8.x (fix top app bar style to align in notebook, popout, and mast)
spacetelescope · Jan 5, 2024 · b3bf1bf · b3bf1bf
2 parents 63afd43 + c95a9ff
commit b3bf1bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,8 @@
 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
@@ -39,7 +39,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 / @@ -4,6 +4,8 @@ @@
     Bug Fixes
     ---------
+    * Fix app top-bar alignment in popouts and when embedded in websites. [#2648]
     Cubeviz
     ^^^^^^^
@@ Expand Down @@