From 6e8dcc6ab87fcd61ff936f33acadc7843188b707 Mon Sep 17 00:00:00 2001 From: slhale <sarah.hale@nasa.gov> Date: Mon, 24 Aug 2015 09:26:39 -0700 Subject: [PATCH] [Inspector] Fix location label heights Made it so that the last element of the location does not get misaligned. Also changed the element background highlighting and arrow size. --- .../general/res/css/theme-espresso.css | 18 +++++++++--------- .../commonUI/general/res/sass/tree/_pane.scss | 14 ++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 74765caecf..195e492a87 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -5243,7 +5243,6 @@ input[type="text"] { display: inline-block; white-space: nowrap; transition: background-color 0.2s; - background-color: #4d4d4d; border-radius: 4px; padding: 3px; padding-bottom: 0; @@ -5251,22 +5250,23 @@ input[type="text"] { line-height: 15px; } /* line 192, ../sass/tree/_pane.scss */ .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label:hover { - background-color: #595959; } - /* line 203, ../sass/tree/_pane.scss */ + background-color: #404040; } + /* line 204, ../sass/tree/_pane.scss */ .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label .icon.type-icon { font-size: 14px; } - /* line 206, ../sass/tree/_pane.scss */ + /* line 207, ../sass/tree/_pane.scss */ .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label .icon.type-icon .l-icon-link { color: #49dedb; font-size: 6px; margin-left: -22px; margin-right: 4px; } - /* line 217, ../sass/tree/_pane.scss */ + /* line 218, ../sass/tree/_pane.scss */ .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location:after { content: '>'; font-family: symbolsfont; - font-size: 10px; - margin-left: -4px; } - /* line 223, ../sass/tree/_pane.scss */ + font-size: 8px; + margin-left: -6px; } + /* line 224, ../sass/tree/_pane.scss */ .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location:last-child:after { - content: ''; } + content: ''; + display: inline-block; } diff --git a/platform/commonUI/general/res/sass/tree/_pane.scss b/platform/commonUI/general/res/sass/tree/_pane.scss index 8cb628f817..ed4d5a15fb 100644 --- a/platform/commonUI/general/res/sass/tree/_pane.scss +++ b/platform/commonUI/general/res/sass/tree/_pane.scss @@ -105,7 +105,7 @@ $transitionTime: 0.35s; // For the left menu open/close // Move left tab buttons close to the left splitter bar .object-browse-bar { position: relative; - + .left-pane-tabs { position: relative; cursor: pointer; @@ -134,7 +134,7 @@ $transitionTime: 0.35s; // For the left menu open/close content: '<'; } } - + .items-select { margin-left: 10px; } @@ -188,9 +188,10 @@ $transitionTime: 0.35s; // For the left menu open/close // Colors transition: background-color 0.2s; - background-color: lighten($colorBodyBg, 10%); + //background-color: lighten($colorBodyBg, 10%); &:hover { - background-color: lighten($colorBodyBg, 15%); + //background-color: lighten($colorBodyBg, 15%); + background-color: lighten($colorBodyBg, 5%); } // Sizing and spacing @@ -217,11 +218,12 @@ $transitionTime: 0.35s; // For the left menu open/close &:after { content: '>'; font-family: symbolsfont; - font-size: 10px; - margin-left: -4px; + font-size: 8px; + margin-left: -6px; } &:last-child:after { content: ''; + display: inline-block; } } }