Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Toolbar dividers #944

Merged
merged 3 commits into from
Oct 20, 2021
Merged

Toolbar dividers #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7108756
vertical divider and padding between toolbar items
kecnry Oct 18, 2021
31677d5
remove duplicate divider in redshift slider
kecnry Oct 12, 2021
1366710
move divider out of tooltip
kecnry Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions jdaviz/app.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<template>
<v-app id="web-app" class="jdaviz">
<v-app-bar color="primary" dark :dense="state.settings.dense_toolbar" flat app absolute clipped-right>
<j-tooltip :tipid="item.name" v-for="item in state.tool_items">
<jupyter-widget :widget="item.widget" :key="item.name"></jupyter-widget>
</j-tooltip>
<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>
<j-tooltip :tipid="item.name">
<jupyter-widget :widget="item.widget" :key="item.name"></jupyter-widget>
</j-tooltip>
</v-toolbar-items>
<v-toolbar-items>
<v-divider v-if="config === 'mosviz'" vertical style="margin: 0px 10px"></v-divider>
<j-tooltip v-if="config === 'mosviz'" tipid="lock-row-toggle">
<v-btn
icon
Expand Down Expand Up @@ -250,4 +255,13 @@ a:active {
background-color: #c75109 !important;
}


.v-divider.theme--dark {
/* make the v-divider standout more */
border-color: hsla(0,0%,100%,.35) !important;
}

.no-hint .v-text-field__details {
display: none !important;
}
</style>
3 changes: 1 addition & 2 deletions jdaviz/configs/specviz/plugins/redshift_slider/redshift_slider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
:step="slider_step"
>
<template v-slot:prepend>
<v-divider vertical></v-divider>
<v-select
class="pl-md-4"
class="pl-md-4 no-hint"
:items="['Redshift', 'RV (km/s)']"
v-model="slider_type"
dense>
Expand Down