ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-20 17:11:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'open933' into vista-r3-builds

Browse Source
This commit is contained in:
Pete Richards 2016-08-08 11:37:29 -07:00
commit a53a5fd807
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/res/sass/user-environ/_layout.scss
View File

@ -129,8 +129,6 @@
}
.primary-pane {
// Clip element that have min-widths
overflow: hidden;
// Need to lift up this pane to ensure that 'collapsed' panes don't block user interactions
z-index: 4;
}

5
platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss
View File

@ -27,9 +27,9 @@
}
.l-time-conductor-holder {
$minW: 500px;
border-top: 1px solid $colorInteriorBorder;
min-width: $minW;
// Clip if Time Conductor min-width is exceeded
overflow: hidden;
padding-top: $interiorMargin;
}
@ -98,6 +98,7 @@
$r2H: nth($ueTimeConductorH, 2);
$r3H: nth($ueTimeConductorH, 3);
min-width: 500px;
position: relative;
> .l-row-elem {