From 7a7cabedccb1a645505c25c879ee9bff1d369f9b Mon Sep 17 00:00:00 2001 From: slhale Date: Tue, 25 Aug 2015 10:18:31 -0700 Subject: [PATCH] [Inspector] Add hovertext and scrolling Made the inspector capable of scrolling. Added hovertext to the contextual and primary location sections for some clarification. #73. --- .../general/res/css/theme-espresso.css | 117 +++++++++--------- .../commonUI/general/res/sass/tree/_pane.scss | 2 + .../res/templates/object-inspector.html | 8 +- 3 files changed, 68 insertions(+), 59 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 35369d855d..16ad1a9105 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -5256,61 +5256,64 @@ input[type="text"] { width: 0 !important; visibility: hidden; opacity: 0; } - /* line 198, ../sass/tree/_pane.scss */ - .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder .info-icon { - color: #0099cc; } - /* line 202, ../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 209, ../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 214, ../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 218, ../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 225, ../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; } - /* line 228, ../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; - white-space: nowrap; - transition: background-color 0.2s; - border-radius: 4px; - padding: 3px; - padding-bottom: 0; - margin: 2px; - line-height: 15px; } - /* line 235, ../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 246, ../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 249, ../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; - text-shadow: black 0 1px 2px; - z-index: 2; } - /* line 263, ../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: 8px; - margin-left: -6px; } - /* line 269, ../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: ''; + /* line 197, ../sass/tree/_pane.scss */ + .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder { + overflow-y: auto; } + /* line 200, ../sass/tree/_pane.scss */ + .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder .info-icon { + color: #0099cc; } + /* 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 { + font-size: 0.9em; + padding: 2px 0px; + margin: 2px 0px; + border-top: solid 1px grey; } + /* line 211, ../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 216, ../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 220, ../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 227, ../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; } + /* line 230, ../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; + white-space: nowrap; + transition: background-color 0.2s; + border-radius: 4px; + padding: 3px; + padding-bottom: 0; + margin: 2px; + line-height: 15px; } + /* line 237, ../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 248, ../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 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 .icon.type-icon .l-icon-link { + color: #49dedb; + font-size: 6px; + margin-left: -22px; + margin-right: 4px; + text-shadow: black 0 1px 2px; + z-index: 2; } + /* line 265, ../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: 8px; + margin-left: -6px; } + /* line 271, ../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 94bd86779c..14fa55b9df 100644 --- a/platform/commonUI/general/res/sass/tree/_pane.scss +++ b/platform/commonUI/general/res/sass/tree/_pane.scss @@ -195,6 +195,8 @@ $transitionTime: 0.35s; // For the left menu open/close } .holder.inspector-holder { + overflow-y: auto; + .info-icon { color: $colorKey; } diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html index b2e73d81e9..43a96e26bb 100644 --- a/platform/commonUI/general/res/templates/object-inspector.html +++ b/platform/commonUI/general/res/templates/object-inspector.html @@ -30,7 +30,9 @@ {{ data.value }}
  • - Contextual Location + + Contextual Location +
  • - Primary Location + + Primary Location +