LT-361: Add borders to viewport and active viewport

This commit is contained in:
Eloízio Salgado 2016-11-18 12:12:07 -02:00
parent 63a7505a8d
commit 5272cc234a
4 changed files with 44 additions and 23 deletions

View File

@ -18,6 +18,8 @@
.removable .removable
.imageViewerViewport .imageViewerViewport
theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)
canvas canvas
border-color: transparent border-color: transparent
border-style: solid border-style: solid
@ -27,9 +29,26 @@
.removable .removable
.imageViewerViewport .imageViewerViewport
theme('border-right', '%s solid $uiBorderColor' % $uiBorderThickness) theme('border-right', '%s solid $uiBorderColor' % $uiBorderThickness)
&:first-child
.removable
.imageViewerViewport
theme('border-left', '%s solid $uiBorderColor' % $uiBorderThickness)
&.active &.active
.removable .removable
.imageViewerViewport .imageViewerViewport
border-right: none !important
canvas canvas
theme('border-color', '$uiBorderColorActive') theme('border-color', '$uiBorderColorActive')
.sidebar-left-open
#layoutManagerTarget
#imageViewerViewports
.viewportContainer
&:first-child
.removable
.imageViewerViewport
border-left: none

View File

@ -1,19 +1,14 @@
Template.viewerSection.events({ const isSidebarOpen = sidebarName => {
'transitionend .sidebarMenu'(event) { handleResize();
if (!event.target.classList.contains('sidebarMenu')) { return Template.instance().data.state.get(sidebarName);
return; };
}
handleResize();
}
});
Template.viewerSection.helpers({ Template.viewerSection.helpers({
leftSidebarOpen() { leftSidebarOpen() {
return Template.instance().data.state.get('leftSidebar'); return isSidebarOpen('leftSidebar');
}, },
rightSidebarOpen() { rightSidebarOpen() {
return Template.instance().data.state.get('rightSidebar'); return isSidebarOpen('rightSidebar');
} }
}); });

View File

@ -30,9 +30,11 @@
margin-left: - $studiesSidebarMenuWidth margin-left: - $studiesSidebarMenuWidth
max-width: $studiesSidebarMenuWidth max-width: $studiesSidebarMenuWidth
order: 1 order: 1
display: none
&.sidebar-open &.sidebar-open
margin-left: 0 margin-left: 0
display: block
.mainContent .mainContent
flex: 1 flex: 1
@ -50,6 +52,7 @@
order: 3 order: 3
padding-left: 6px padding-left: 6px
position: relative position: relative
display: none
&[data-timepoints="3"] &[data-timepoints="3"]
margin-right: - ($lesionsSidebarMenuWidth + 135.5px) margin-right: - ($lesionsSidebarMenuWidth + 135.5px)
@ -59,18 +62,9 @@
margin-right: - ($lesionsSidebarMenuWidth + 270px) margin-right: - ($lesionsSidebarMenuWidth + 270px)
max-width: $lesionsSidebarMenuWidth + 270px max-width: $lesionsSidebarMenuWidth + 270px
&:before
theme('background-color', '$uiBorderColor')
content: ''
display: block
height: 100%
left: 5px
position: absolute
top: 0
width: $uiBorderThickness
&.sidebar-open &.sidebar-open
margin-right: 0 margin-right: 0
display: block
.studiesListedChanger .studiesListedChanger
theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness) theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)

View File

@ -3,5 +3,18 @@
#imageViewerViewports #imageViewerViewports
height: 100% height: 100%
padding-bottom: 1px padding-bottom: 1px
padding-right: 6px
width: 100% width: 100%
padding-right: 0
.mainContent
&.sidebar-right-open
#imageViewerViewports
padding-right: 7px
&.sidebar-left-open:not(.sidebar-right-open)
#imageViewerViewports
padding-right: 1px
&.sidebar-left-open.sidebar-right-open
#imageViewerViewports
padding-right: 8px