From 953bd9d8fc0875524d784e8cd4604da98796c8b8 Mon Sep 17 00:00:00 2001 From: slhale Date: Thu, 27 Aug 2015 16:31:42 -0700 Subject: [PATCH] [Inspector] Inform user of multiple selection The object inspector now displays how many selected items there are if there are more than one. --- .../general/res/css/theme-espresso.css | 28 ++++++++++++------- .../commonUI/general/res/sass/tree/_pane.scss | 9 ++++++ .../res/templates/object-inspector.html | 5 ++++ 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index ac736be9d9..368361b01d 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -5293,27 +5293,35 @@ input[type="text"] { .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder .info-icon { color: #0099cc; } /* line 215, ../sass/tree/_pane.scss */ + .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder .number-selected { + font-size: .8em; + padding: 6px; + background-color: #595959; + color: #a6a6a6; + border-radius: 4px; + margin-top: 4px; } + /* 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 { font-size: 0.9em; padding: 2px 0px; margin: 2px 0px; border-top: solid 1px grey; } - /* line 222, ../sass/tree/_pane.scss */ + /* line 231, ../sass/tree/_pane.scss */ .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li:first-child { border-top-width: 0px; } - /* line 227, ../sass/tree/_pane.scss */ + /* line 236, ../sass/tree/_pane.scss */ .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li em { font-weight: bold; line-height: 1.25em; } - /* line 231, ../sass/tree/_pane.scss */ + /* line 240, ../sass/tree/_pane.scss */ .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li em:after { content: '\A'; white-space: pre; } - /* line 238, ../sass/tree/_pane.scss */ + /* line 247, ../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 { display: inline-block; max-width: 100%; } - /* line 242, ../sass/tree/_pane.scss */ + /* line 251, ../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 { cursor: pointer; display: inline-block; @@ -5325,13 +5333,13 @@ input[type="text"] { max-width: 100%; text-overflow: ellipsis; overflow-x: hidden; } - /* line 249, ../sass/tree/_pane.scss */ + /* line 258, ../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: #404040; } - /* line 263, ../sass/tree/_pane.scss */ + /* line 272, ../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 266, ../sass/tree/_pane.scss */ + /* line 275, ../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; @@ -5339,7 +5347,7 @@ input[type="text"] { margin-right: 9px; text-shadow: black 0 1px 2px; z-index: 2; } - /* line 280, ../sass/tree/_pane.scss */ + /* line 289, ../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; @@ -5347,7 +5355,7 @@ input[type="text"] { position: relative; top: -8px; left: -4px; } - /* line 290, ../sass/tree/_pane.scss */ + /* line 299, ../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: ''; display: inline-block; } diff --git a/platform/commonUI/general/res/sass/tree/_pane.scss b/platform/commonUI/general/res/sass/tree/_pane.scss index 5771620614..6a3965c3cf 100644 --- a/platform/commonUI/general/res/sass/tree/_pane.scss +++ b/platform/commonUI/general/res/sass/tree/_pane.scss @@ -212,6 +212,15 @@ $transitionTime: 0.35s; // For the pane open/close color: $colorKey; } + .number-selected { + font-size: .8em; + padding: 6px; + background-color: lighten($colorBodyBg, 15%); + color: lighten($colorBodyBg, 45%); + border-radius: 4px; + margin-top: 4px; + } + ul li { font-size: 0.9em; diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html index dc38294ad6..b00591930a 100644 --- a/platform/commonUI/general/res/templates/object-inspector.html +++ b/platform/commonUI/general/res/templates/object-inspector.html @@ -24,6 +24,11 @@  +
+ {{ngModel.inspectionObjects.length}} items selected +
+