Skip to content

Commit

Permalink
[Frontend] Fix for bad fix
Browse files Browse the repository at this point in the history
Fixes #1112
Put overflow: hidden back at
outer wrapper level (now on .t-object.primary-pane
) which doens't clip the Inspector expand/collapse;
did better unit testing;
  • Loading branch information
charlesh88 committed Aug 8, 2016
1 parent 62ee7e5 commit ae39343
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 3 additions & 1 deletion platform/commonUI/general/res/sass/user-environ/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -97,8 +96,6 @@
$r1H: nth($ueTimeConductorH, 1);
$r2H: nth($ueTimeConductorH, 2);
$r3H: nth($ueTimeConductorH, 3);

min-width: 500px;
position: relative;

> .l-row-elem {
Expand Down

0 comments on commit ae39343

Please sign in to comment.