From 71207d643aadddfaf0f2636654116d72c1a33453 Mon Sep 17 00:00:00 2001 From: slhale Date: Thu, 20 Aug 2015 15:21:02 -0700 Subject: [PATCH] [Inspector] Left pane close works again Moved ng-class up to a parent so that the left position would be correct relative to the left split overall. #73. --- .../commonUI/browse/res/templates/browse.html | 8 +-- .../general/res/css/theme-espresso.css | 61 +++++++++--------- .../commonUI/general/res/sass/tree/_pane.scss | 62 +++++++++---------- 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index b5b7a59a3b..3943c11db6 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -51,12 +51,12 @@ ng-class="{inactive: !paneModel.leftPane}"> -
+
- -
+ +
'; } - /* line 130, ../sass/tree/_pane.scss */ - .items.pane .object-browse-bar .left-pane-tabs.activePane:after { - content: '<'; } - /* line 135, ../sass/tree/_pane.scss */ - .items.pane .object-browse-bar .items-select { - margin-left: 10px; } + +/* line 104, ../sass/tree/_pane.scss */ +.object-browse-bar { + position: relative; } + /* line 107, ../sass/tree/_pane.scss */ + .object-browse-bar .left-pane-tabs { + position: relative; + cursor: pointer; + left: -10px; + width: 11px; + height: 16px; + line-height: 16px; + font-size: 10px; + top: 3px; + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; + background-color: #595959; } + /* line 124, ../sass/tree/_pane.scss */ + .object-browse-bar .left-pane-tabs.inactivePane { + left: -15px; } + /* line 127, ../sass/tree/_pane.scss */ + .object-browse-bar .left-pane-tabs.inactivePane:after { + content: '>'; } + /* line 131, ../sass/tree/_pane.scss */ + .object-browse-bar .left-pane-tabs.activePane:after { + content: '<'; } + /* line 136, ../sass/tree/_pane.scss */ + .object-browse-bar .items-select { + margin-left: 10px; } /* line 141, ../sass/tree/_pane.scss */ .splitter-bar.right { diff --git a/platform/commonUI/general/res/sass/tree/_pane.scss b/platform/commonUI/general/res/sass/tree/_pane.scss index 9f9b890128..2af309cbe1 100644 --- a/platform/commonUI/general/res/sass/tree/_pane.scss +++ b/platform/commonUI/general/res/sass/tree/_pane.scss @@ -90,52 +90,52 @@ $transitionTime: 0.35s; } } -// The main view needs to align left when the panes are moving around -.items.pane { +// The main view needs to align left when the left pane is moving around +.split-pane-component.secondary-split.pane.right { transition: left $transitionTime; transition-timing-function: ease-out; &.leftInactive { 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; + cursor: pointer; - .left-pane-tabs { - position: relative; - cursor: pointer; + left: -10px; + width: 11px; + height: 16px; + line-height: 16px; + font-size: 10px; + top: 3px; - left: -10px; - width: 11px; - height: 16px; - line-height: 16px; - font-size: 10px; - top: 3px; + //border-radius: 2px; + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; + background-color: darken($colorBodyFg, 25%); - //border-radius: 2px; - border-top-right-radius: 2px; - border-bottom-right-radius: 2px; - background-color: darken($colorBodyFg, 25%); + // Change button icon depending on state + &.inactivePane { + left: -15px; - // Change button icon depending on state - &.inactivePane { - left: -15px; - - &:after { - content: '>';//'F'; - } - } - &.activePane:after { - content: '<'; + &:after { + content: '>';//'F'; } } - - .items-select { - margin-left: 10px; + &.activePane:after { + content: '<'; } } + + .items-select { + margin-left: 10px; + } } .splitter-bar.right {