ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-20 00:51:09 +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 12:21:52 -07:00
commit 4249d90d80
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@
line-height: $ueTopBarH;
}
.primary-pane {
.t-object.primary-pane {
// Need to lift up this pane to ensure that 'collapsed' panes don't block user interactions
z-index: 4;
}
@ -212,6 +212,8 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
.holder-object {
top: $bodyMargin;
bottom: $interiorMargin;
// Clip element that have min-widths
overflow: hidden;
}
.holder-inspector {
top: $bodyMargin;

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

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