Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Adjust how css is applied to the max-merge controls #1330

Merged
merged 1 commit into from
Oct 4, 2023
Merged

Adjust how css is applied to the max-merge controls #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### Improvements
- Style can specify a dtype of 'source' to maintain the original dtype even when compositing frames ([#1326](../../pull/1326))
- Max Merge option in Frame Selector ([#1306](../../pull/1306))
- Max Merge option in Frame Selector ([#1306](../../pull/1306), [#1330](../../pull/1330))

### Changes
- Prohibit bioformats and vips from reading mrxs directly ([#1328](../../pull/1328))
Expand Down
16 changes: 13 additions & 3 deletions girder/girder_large_image/web_client/vue/components/DualInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
:disabled="merge"
>
</td>
<td style="width: 100%">
<td class="slider-control-cell">
<input
v-model="value"
type="range"
Expand All @@ -64,13 +64,13 @@ export default {
</td>
<td
v-show="merge !== undefined"
style="min-width: 150px; text-align: right;"
class="max-merge-cell"
:title="'Max Merge ' + label"
>
<input
:id="'maxMerge'+label"
v-model="merge"
type="checkbox"
style="margin: 0px 5px 0px 10px"
>
<label :for="'maxMerge'+label">Max Merge</label>
</td>
Expand Down Expand Up @@ -110,4 +110,14 @@ export default {
top: -1px;
left: 50%;
}
.slider-control-cell {
width: 100%;
}
.max-merge-cell {
min-width: 125px;
text-align: right;
}
.max-merge-cell input[type="checkbox"] {
margin: 0px 2px 0px 0px;
}
</style>