ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-28 17:08:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Inspector] Left pane close works again

Browse Source 
Moved ng-class up to a parent so that the
left position would be correct relative to
the left split overall. #73.
This commit is contained in:
slhale 2015-08-20 15:21:02 -07:00
parent d9a65a1844
commit 71207d643a
3 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/browse/res/templates/browse.html
View File

@ -51,12 +51,12 @@
ng-class="{inactive: !paneModel.leftPane}"> ng-class="{inactive: !paneModel.leftPane}">
</mct-splitter> </mct-splitter>
<div class='split-pane-component secondary-split pane right'> <div class='split-pane-component secondary-split pane right'
ng-class='{leftInactive: !paneModel.leftPane}'>
<mct-split-pane class='contents abs' <mct-split-pane class='contents abs'
anchor='right'> anchor='right'>
<div class='split-pane-component items pane' <div class='split-pane-component items pane'>
ng-class='{leftInactive: !paneModel.leftPane}'>
<div class='holder abs' <div class='holder abs'
id='content-area'> id='content-area'>
<mct-representation key="'browse-object'" <mct-representation key="'browse-object'"

61
platform/commonUI/general/res/css/theme-espresso.css
View File

@ -5170,40 +5170,41 @@ input[type="text"] {
border-width: 0; } border-width: 0; }
/* line 94, ../sass/tree/_pane.scss */ /* line 94, ../sass/tree/_pane.scss */
.items.pane { .split-pane-component.secondary-split.pane.right {
transition: left 0.35s; transition: left 0.35s;
transition-timing-function: ease-out; } transition-timing-function: ease-out; }
/* line 98, ../sass/tree/_pane.scss */ /* line 98, ../sass/tree/_pane.scss */
.items.pane.leftInactive { .split-pane-component.secondary-split.pane.right.leftInactive {
left: 0 !important; } left: 0 !important; }
/* line 103, ../sass/tree/_pane.scss */
.items.pane .object-browse-bar { /* line 104, ../sass/tree/_pane.scss */
position: relative; } .object-browse-bar {
/* line 106, ../sass/tree/_pane.scss */ position: relative; }
.items.pane .object-browse-bar .left-pane-tabs { /* line 107, ../sass/tree/_pane.scss */
position: relative; .object-browse-bar .left-pane-tabs {
cursor: pointer; position: relative;
left: -10px; cursor: pointer;
width: 11px; left: -10px;
height: 16px; width: 11px;
line-height: 16px; height: 16px;
font-size: 10px; line-height: 16px;
top: 3px; font-size: 10px;
border-top-right-radius: 2px; top: 3px;
border-bottom-right-radius: 2px; border-top-right-radius: 2px;
background-color: #595959; } border-bottom-right-radius: 2px;
/* line 123, ../sass/tree/_pane.scss */ background-color: #595959; }
.items.pane .object-browse-bar .left-pane-tabs.inactivePane { /* line 124, ../sass/tree/_pane.scss */
left: -15px; } .object-browse-bar .left-pane-tabs.inactivePane {
/* line 126, ../sass/tree/_pane.scss */ left: -15px; }
.items.pane .object-browse-bar .left-pane-tabs.inactivePane:after { /* line 127, ../sass/tree/_pane.scss */
content: '>'; } .object-browse-bar .left-pane-tabs.inactivePane:after {
/* line 130, ../sass/tree/_pane.scss */ content: '>'; }
.items.pane .object-browse-bar .left-pane-tabs.activePane:after { /* line 131, ../sass/tree/_pane.scss */
content: '<'; } .object-browse-bar .left-pane-tabs.activePane:after {
/* line 135, ../sass/tree/_pane.scss */ content: '<'; }
.items.pane .object-browse-bar .items-select { /* line 136, ../sass/tree/_pane.scss */
margin-left: 10px; } .object-browse-bar .items-select {
margin-left: 10px; }
/* line 141, ../sass/tree/_pane.scss */ /* line 141, ../sass/tree/_pane.scss */
.splitter-bar.right { .splitter-bar.right {

62
platform/commonUI/general/res/sass/tree/_pane.scss
View File

@ -90,52 +90,52 @@ $transitionTime: 0.35s;
} }
} }
// The main view needs to align left when the panes are moving around // The main view needs to align left when the left pane is moving around
.items.pane { .split-pane-component.secondary-split.pane.right {
transition: left $transitionTime; transition: left $transitionTime;
transition-timing-function: ease-out; transition-timing-function: ease-out;
&.leftInactive { &.leftInactive {
left: 0 !important; left: 0 !important;
} }
}
// Move buttons close to the splitter bar
.object-browse-bar { // Move left tab buttons close to the left splitter bar
.object-browse-bar {
position: relative;
.left-pane-tabs {
position: relative; position: relative;
cursor: pointer;
.left-pane-tabs { left: -10px;
position: relative; width: 11px;
cursor: pointer; height: 16px;
line-height: 16px;
font-size: 10px;
top: 3px;
left: -10px; //border-radius: 2px;
width: 11px; border-top-right-radius: 2px;
height: 16px; border-bottom-right-radius: 2px;
line-height: 16px; background-color: darken($colorBodyFg, 25%);
font-size: 10px;
top: 3px;
//border-radius: 2px; // Change button icon depending on state
border-top-right-radius: 2px; &.inactivePane {
border-bottom-right-radius: 2px; left: -15px;
background-color: darken($colorBodyFg, 25%);
// Change button icon depending on state &:after {
&.inactivePane { content: '>';//'F';
left: -15px;
&:after {
content: '>';//'F';
}
}
&.activePane:after {
content: '<';
} }
} }
&.activePane:after {
.items-select { content: '<';
margin-left: 10px;
} }
} }
.items-select {
margin-left: 10px;
}
} }
.splitter-bar.right { .splitter-bar.right {