diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 0ea964780c..79644b5bb5 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -73,8 +73,7 @@
+ ng-model="treeModel">
diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 6365119894..4f196b8f74 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -43,7 +43,7 @@ $ueColMargin: 1.5%; $ueAppLogoW: 105px; $ueEditToolBarH: 25px; $ueBrowseLeftPaneTreeW: 25%; -$ueBrowseRightPaneInspectW: 10%; +$ueBrowseRightPaneInspectW: 20%; $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; $ueTimeControlH: (33px, 20px, 20px); diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index 69e00dbab6..fcb8ebc959 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -23,12 +23,18 @@ //.pane.right.t-inspect { @include test(green, 0.3); } // TEMP! -.t-inspector, -.t-inspector table tr td { +.l-inspect, +.l-inspect table tr td { font-size: 0.7rem; } -.t-inspector { +.l-inspect { + color: $colorInspectorFg; + .pane-header { + color: pushBack($colorInspectorFg, 20%); + font-size: 0.8rem; + } + ul li, em { display: block; @@ -36,7 +42,6 @@ } ul li { - line-height: 130%; margin-bottom: $interiorMarginLg * 2; } @@ -61,7 +66,6 @@ white-space: nowrap; } &.value { - //word-wrap: break-word; // Doesn't work in ? word-break: break-all; } } @@ -70,4 +74,29 @@ border-top: none !important; } } + + .inspector-location { + line-height: 180%; + .location-item { + cursor: pointer; + display: inline; + position: relative; + padding: 2px 4px; + &:hover { + background: $colorItemTreeHoverBg; + color: $colorItemTreeHoverFg; + .icon { + color: $colorItemTreeIconHover; + } + } + } + &:not(.first):before { + color: pushBack($colorInspectorFg, 15%); + content: '\3e'; + display: inline-block; + font-family: symbolsfont; + font-size:7px; + width: 4px; + } + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index bc61fbc35e..429dc361fe 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -249,7 +249,7 @@ label.checkbox.custom { .l-elem-wrapper { //@include test(#66f, 0.2); - @include webkitProp(justify-content, flex-start); + @include justify-content(flex-start); mct-representation { // Holds the context-available item // Must have min-width to make flex work properly diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index d64f456b2e..b4ec062bbe 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -125,8 +125,8 @@ ul.tree { // NOTE: [Mobile] Removed Hover on Mobile @include desktop { &:hover { - background: rgba($colorBodyFg, 0.1); //lighten($colorBodyBg, 5%); - color: pullForward($colorBodyFg, 20%); + background: $colorItemTreeHoverBg; + color: $colorItemTreeHoverFg; .icon { color: $colorItemTreeIconHover; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 49944adc44..6a3d9ac2f5 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -212,7 +212,7 @@ width: $ueBrowseLeftPaneTreeW; } &.t-inspect.right { - min-width: 150px; + min-width: 100px; max-width: 800px; width: $ueBrowseRightPaneInspectW; } @@ -234,6 +234,14 @@ .pane { position: absolute; + + .pane-header { + text-transform: uppercase; + height: $ueTopBarH; + line-height: $ueTopBarH; + margin-bottom: $interiorMargin; + } + &.treeview.left { .create-btn-holder { bottom: auto; @@ -381,7 +389,6 @@ } } -// MOVED from mobile/_layout.scss // When the tree is hidden, these are the // classes used for the left menu and the // right representation. diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html index 7ca73bb026..235678ad2d 100644 --- a/platform/commonUI/general/res/templates/label.html +++ b/platform/commonUI/general/res/templates/label.html @@ -20,15 +20,15 @@ at runtime from the About dialog for additional information. --> - - {{type.getGlyph()}} - - - - - {{model.name}} - + +{{type.getGlyph()}} + + + + +{{model.name}} + diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html index f5f8e6921b..b635b4ccca 100644 --- a/platform/commonUI/general/res/templates/object-inspector.html +++ b/platform/commonUI/general/res/templates/object-inspector.html @@ -19,7 +19,8 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - + +
Inspection