From 3e5fa30d9d17dfab4f526b370afe11ce85941974 Mon Sep 17 00:00:00 2001 From: larkin Date: Tue, 30 Jun 2015 16:18:37 -0700 Subject: [PATCH 1/5] [Style] Add stub for label link icon --- platform/commonUI/general/res/templates/label.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html index bfa7bd56ff..701e6ff24c 100644 --- a/platform/commonUI/general/res/templates/label.html +++ b/platform/commonUI/general/res/templates/label.html @@ -22,7 +22,14 @@ {{type.getGlyph()}} + - {{model.name}} + + + è + + + {{model.name}} + From d5d7ac90acc929c3bfec92702b34913d47f85319 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 17:58:56 -0700 Subject: [PATCH 2/5] [Frontend] Markup and CSS for link icon indicators WTD-1423 Grid item version with link at bottom right of main icon; --- .../browse/res/templates/items/grid-item.html | 8 +- platform/commonUI/general/res/css/items.css | 73 +++++++++++-------- .../general/res/css/theme-espresso.css | 45 +++++++----- platform/commonUI/general/res/css/tree.css | 63 +++++++++------- .../commonUI/general/res/sass/_constants.scss | 3 +- .../commonUI/general/res/sass/_icons.scss | 3 + .../general/res/sass/items/_item.scss | 30 +++++++- .../commonUI/general/res/sass/tree/_tree.scss | 17 ++++- .../commonUI/general/res/templates/label.html | 9 +-- 9 files changed, 163 insertions(+), 88 deletions(-) diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html index e64afd4a9f..67d744ca1d 100644 --- a/platform/commonUI/browse/res/templates/items/grid-item.html +++ b/platform/commonUI/browse/res/templates/items/grid-item.html @@ -32,7 +32,13 @@
-
{{type.getGlyph()}}
+
+ {{type.getGlyph()}} + + + ô + +
}
diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index c40b3f7bd9..ed1e1c6c4e 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -151,59 +151,70 @@ /* line 160, ../sass/_mixins.scss */ .items-holder .item.grid-item.btn-menu .invoke-menu { color: #828282; } - /* line 42, ../sass/items/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - -moz-transition-property: "color"; - -o-transition-property: "color"; - -webkit-transition-property: "color"; - transition-property: "color"; - -moz-transition-duration: 200ms; - -o-transition-duration: 200ms; - -webkit-transition-duration: 200ms; - transition-duration: 200ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; } /* line 46, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: #0099cc !important; } - /* line 49, ../sass/items/_item.scss */ + /* line 48, ../sass/items/_item.scss */ + .items-holder .item.grid-item:hover .item-main .item-type .l-link-icon { + color: #5bf5ef; } + /* line 52, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-open { opacity: 1; } - /* line 54, ../sass/items/_item.scss */ + /* line 57, ../sass/items/_item.scss */ .items-holder .item.grid-item .contents { top: 5px; right: 5px; bottom: 5px; left: 5px; } - /* line 58, ../sass/items/_item.scss */ + /* line 61, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs { bottom: auto; height: 20px; line-height: 20px; z-index: 5; } - /* line 63, ../sass/items/_item.scss */ + /* line 66, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs .left, .items-holder .item.grid-item .bar.top-bar.abs .right { width: auto; } - /* line 65, ../sass/items/_item.scss */ + /* line 68, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs .left .icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon { margin-left: 5px; } - /* line 70, ../sass/items/_item.scss */ + /* line 73, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.bottom-bar.abs { top: auto; height: 30px; padding: 5px; } - /* line 76, ../sass/items/_item.scss */ + /* line 79, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main { line-height: 160px; z-index: 1; } - /* line 82, ../sass/items/_item.scss */ + /* line 85, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type { + overflow: false; + position: absolute; + top: 40px; + right: 40px; + bottom: 40px; + left: 40px; + width: auto; + height: auto; color: #737373; text-align: center; - font-size: 6em; } - /* line 88, ../sass/items/_item.scss */ + font-size: 96.9px; + line-height: 102px; + bottom: auto; + height: 102px; + top: 30px; } + /* line 97, ../sass/items/_item.scss */ + .items-holder .item.grid-item .item-main .item-type .l-link-icon { + color: #09948f; + height: 36px; + line-height: 36px; + position: absolute; + font-size: 32px; + right: -10px; + bottom: -10px; + z-index: 2; } + /* line 110, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-open { -moz-transition-property: "opacity"; -o-transition-property: "opacity"; @@ -223,17 +234,17 @@ width: 50px; pointer-events: none; text-align: right; } - /* line 100, ../sass/items/_item.scss */ + /* line 122, ../sass/items/_item.scss */ .items-holder .item.grid-item .title { text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; color: #cccccc; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 108, ../sass/items/_item.scss */ + /* line 130, ../sass/items/_item.scss */ .items-holder .item.grid-item .details { font-size: 0.8em; } - /* line 111, ../sass/items/_item.scss */ + /* line 133, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -270,15 +281,15 @@ /* line 160, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected.btn-menu .invoke-menu { color: #52d4ff; } - /* line 116, ../sass/items/_item.scss */ + /* line 138, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { color: #80dfff; } - /* line 117, ../sass/items/_item.scss */ + /* line 139, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-main .item-open { color: #80dfff; } - /* line 118, ../sass/items/_item.scss */ + /* line 140, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .title { color: white; } - /* line 120, ../sass/items/_item.scss */ + /* line 142, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected:hover .item-main .item-type { color: white !important; } diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 49c5675a07..bc8e713630 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -92,7 +92,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -113,38 +113,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1256,26 +1256,37 @@ mct-container { .tabular tr td, .tabular tr .td, .tabular .tr td, .tabular .tr .td { border-top: 1px solid rgba(255, 255, 255, 0.1); min-width: 110px; + color: #fff; padding: 2px 5px; vertical-align: top; } - /* line 107, ../sass/lists/_tabular.scss */ + /* line 108, ../sass/lists/_tabular.scss */ .tabular tr td.numeric, .tabular tr .td.numeric, .tabular .tr td.numeric, .tabular .tr .td.numeric { text-align: right; } - /* line 113, ../sass/lists/_tabular.scss */ + /* line 111, ../sass/lists/_tabular.scss */ + .tabular tr td.s-cell-type-value, .tabular tr .td.s-cell-type-value, .tabular .tr td.s-cell-type-value, .tabular .tr .td.s-cell-type-value { + text-align: right; } + /* line 113, ../sass/lists/_tabular.scss */ + .tabular tr td.s-cell-type-value .l-cell-contents, .tabular tr .td.s-cell-type-value .l-cell-contents, .tabular .tr td.s-cell-type-value .l-cell-contents, .tabular .tr .td.s-cell-type-value .l-cell-contents { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + padding-left: 5px; + padding-right: 5px; } + /* line 122, ../sass/lists/_tabular.scss */ .tabular.filterable tbody, .tabular.filterable .tbody { top: 36px; } - /* line 118, ../sass/lists/_tabular.scss */ + /* line 127, ../sass/lists/_tabular.scss */ .tabular.fixed-header { height: 100%; } - /* line 120, ../sass/lists/_tabular.scss */ + /* line 129, ../sass/lists/_tabular.scss */ .tabular.fixed-header thead, .tabular.fixed-header .thead, .tabular.fixed-header tbody tr, .tabular.fixed-header .tbody .tr { display: table; table-layout: fixed; } - /* line 125, ../sass/lists/_tabular.scss */ + /* line 134, ../sass/lists/_tabular.scss */ .tabular.fixed-header thead, .tabular.fixed-header .thead { width: calc(100% - 10px); } - /* line 128, ../sass/lists/_tabular.scss */ + /* line 137, ../sass/lists/_tabular.scss */ .tabular.fixed-header tbody, .tabular.fixed-header .tbody { overflow: hidden; position: absolute; @@ -1288,7 +1299,7 @@ mct-container { top: 18px; display: block; overflow-y: scroll; } - /* line 136, ../sass/lists/_tabular.scss */ + /* line 145, ../sass/lists/_tabular.scss */ .tabular.t-event-messages td, .tabular.t-event-messages .td { min-width: 150px; } @@ -2495,7 +2506,7 @@ label.checkbox.custom { -webkit-box-sizing: border-box; box-sizing: border-box; border-top: 1px solid #737373; - line-height: 1.4rem; + line-height: 1.5rem; padding: 3px 10px 3px 30px; white-space: nowrap; } /* line 45, ../sass/controls/_menus.scss */ diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 75b40aa115..614a74df81 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -122,9 +122,9 @@ ul.tree { -webkit-transition: background-color 0.25s; transition: background-color 0.25s; display: block; - font-size: 0.80em; - height: 1.4rem; - line-height: 1.4rem; + font-size: 0.8em; + height: 1.5rem; + line-height: 1.5rem; margin-bottom: 3px; position: relative; } /* line 38, ../sass/tree/_tree.scss */ @@ -150,17 +150,19 @@ ul.tree { left: 20px; } /* line 55, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon { - overflow: hidden; + overflow: false; position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; + top: 0; + right: 0; + bottom: 0; + left: 0; width: auto; height: auto; text-shadow: rgba(0, 0, 0, 0.6) 0 1px 2px; - color: #0099cc; } - /* line 59, ../sass/tree/_tree.scss */ + color: #0099cc; + right: auto; + width: 1em; } + /* line 60, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon .alert { text-shadow: rgba(0, 0, 0, 0.3) 0 1px 2px; background: #333; @@ -175,7 +177,16 @@ ul.tree { width: auto; position: absolute; z-index: 2; } - /* line 75, ../sass/tree/_tree.scss */ + /* line 75, ../sass/tree/_tree.scss */ + ul.tree li span.tree-item .label .type-icon .icon.l-link-icon { + text-shadow: black 0 1px 2px; + color: #5bf5ef; + position: absolute; + font-size: 0.5em; + right: -5px; + bottom: -8px; + z-index: 2; } + /* line 86, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .title-label { overflow: hidden; position: absolute; @@ -186,55 +197,55 @@ ul.tree { width: auto; height: auto; display: block; - left: 20px; + left: 25px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 87, ../sass/tree/_tree.scss */ + /* line 98, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading { pointer-events: none; } - /* line 89, ../sass/tree/_tree.scss */ + /* line 100, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label { opacity: 0.5; } - /* line 91, ../sass/tree/_tree.scss */ + /* line 102, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label .title-label { font-style: italic; } - /* line 95, ../sass/tree/_tree.scss */ + /* line 106, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .wait-spinner { margin-left: 14px; } - /* line 100, ../sass/tree/_tree.scss */ + /* line 111, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected { background: #005177; color: #fff; } - /* line 104, ../sass/tree/_tree.scss */ + /* line 115, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .view-control { color: #0099cc; } - /* line 107, ../sass/tree/_tree.scss */ + /* line 118, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .label .type-icon { color: #fff; } - /* line 113, ../sass/tree/_tree.scss */ + /* line 124, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover { background: #404040; color: #cccccc; } - /* line 116, ../sass/tree/_tree.scss */ + /* line 127, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .context-trigger { display: block; } - /* line 119, ../sass/tree/_tree.scss */ + /* line 130, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .icon { color: #33ccff; } - /* line 125, ../sass/tree/_tree.scss */ + /* line 136, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.loading) { cursor: pointer; } - /* line 129, ../sass/tree/_tree.scss */ + /* line 140, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger { top: -1px; position: absolute; right: 3px; } - /* line 135, ../sass/tree/_tree.scss */ + /* line 146, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger .invoke-menu { font-size: 0.75em; height: 0.9rem; line-height: 0.9rem; } - /* line 144, ../sass/tree/_tree.scss */ + /* line 155, ../sass/tree/_tree.scss */ ul.tree ul.tree { margin-left: 15px; } diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 8a8fed19d1..1cb6b20fda 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -42,6 +42,7 @@ $colorKeySelectedBg: #005177; $colorKeyFg: #fff; $colorAlt1: #ffc700; $colorAlert: #ff3c00; +$colorIconLink: #5bf5ef; $colorPausedBg: #c56f01; $colorPausedFg: #fff; $colorCreateBtn: $colorKey; @@ -145,7 +146,7 @@ $controlDisabledOpacity: 0.3; $formLabelW: 20%; $formInputH: 22px; $formRowCtrlsH: 14px; -$menuLineH: 1.4rem; +$menuLineH: 1.5rem; $scrollbarTrackSize: 10px; $scrollbarTrackColorBg: rgba(#000, 0.4); $btnStdH: 25px; diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 71be99d43a..c0f40a729a 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -85,3 +85,6 @@ //font-size: $menuLineH * 0.95 // Normalizing for new icomoon symbols font } +.l-link-icon { +} + diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index 5a5cdaf9a3..edfdc619a2 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -29,6 +29,9 @@ &.grid-item { //div { @include test() } $d: $ueBrowseGridItemLg; + //$iconD: 100px; + $iconMargin: 40px; + $iconD: ($d - ($iconMargin * 2)) * 0.85; $transTime: 200ms; @include btnSubtle($colorItemBase); box-sizing: border-box; @@ -39,12 +42,12 @@ margin-bottom: $interiorMarginSm; margin-right: $interiorMarginSm; position: relative; - .item-main .item-type { - @include trans-prop-nice("color", $transTime); - } &:hover .item-main { .item-type { color: $colorKey !important; + .l-link-icon { + color: $colorIconLink; + } } .item-open { //display: block; @@ -80,10 +83,29 @@ line-height: $lh; z-index: 1; .item-type { + //@include trans-prop-nice("color", $transTime); + @include absPosDefault($iconMargin, false); + //@include test(red); color: $colorItemFg; text-align: center; - font-size: 6em; + font-size: $iconD * 0.95; //6em; + line-height: $iconD; + bottom: auto; + height: $iconD; + top: $iconMargin - 10; //line-height: $lh; + .l-link-icon { + //@include test(blue); + //@include trans-prop-nice("color", $transTime); + color: darken($colorIconLink, 35%); + height: 36px; + line-height: 36px; + position: absolute; + font-size: 32px; + right: -10px; + bottom: -10px; + z-index: 2; + } } .item-open { //@include test(); diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 356bb8a527..d92c9afebb 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -29,7 +29,7 @@ ul.tree { @include border-radius($basicCr); @include single-transition(background-color, 0.25s); display: block; - font-size: 0.80em; + font-size: 0.8em; height: $menuLineH; line-height: $menuLineH; margin-bottom: $interiorMarginSm; @@ -53,9 +53,10 @@ ul.tree { left: $runningItemW + $interiorMargin; .type-icon { - @include absPosDefault(); + @include absPosDefault(0, false); @include txtShdwSubtle(0.6); color: $colorItemTreeIcon; + right: auto; width: 1em; .alert { @include txtShdwSubtle(0.3); background: $colorBodyBg; @@ -71,11 +72,21 @@ ul.tree { position: absolute; z-index: 2; } + .icon.l-link-icon { + @include txtShdwSubtle(1); + $d: 20px; + color: $colorIconLink; + position: absolute; + font-size: 0.5em; + right: -5px; + bottom: -8px; + z-index: 2; + } } .title-label { @include absPosDefault(); display: block; - left: $runningItemW + ($interiorMargin); + left: $runningItemW + ($interiorMargin * 2); //right: $treeContextTriggerW + $interiorMargin; overflow: hidden; text-overflow: ellipsis; diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html index 701e6ff24c..da63abd07a 100644 --- a/platform/commonUI/general/res/templates/label.html +++ b/platform/commonUI/general/res/templates/label.html @@ -22,13 +22,12 @@ {{type.getGlyph()}} - + + + ô + - - - è - {{model.name}} From e0727e848597fdfdcfe954297933f77ee71c5b9d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 18:13:17 -0700 Subject: [PATCH 3/5] [Frontend] Markup and CSS for link icon indicators WTD-1423 Added small icon to upper right; IN PROGRESS; --- .../browse/res/templates/items/grid-item.html | 6 ++-- platform/commonUI/general/res/css/items.css | 35 ++++++++++--------- platform/commonUI/general/res/css/tree.css | 2 +- .../commonUI/general/res/sass/_constants.scss | 2 +- .../commonUI/general/res/sass/_icons.scss | 6 +--- .../general/res/sass/items/_item.scss | 12 ++++--- 6 files changed, 32 insertions(+), 31 deletions(-) diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html index 67d744ca1d..6372b8c393 100644 --- a/platform/commonUI/browse/res/templates/items/grid-item.html +++ b/platform/commonUI/browse/res/templates/items/grid-item.html @@ -29,15 +29,15 @@
P
+ + ô
{{type.getGlyph()}} - - ô - + ô
}
diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index ed1e1c6c4e..4b3ac6f8b9 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -156,7 +156,7 @@ color: #0099cc !important; } /* line 48, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type .l-link-icon { - color: #5bf5ef; } + color: #49dedb; } /* line 52, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-open { opacity: 1; } @@ -177,17 +177,20 @@ width: auto; } /* line 68, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs .left .icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon { - margin-left: 5px; } - /* line 73, ../sass/items/_item.scss */ + margin-left: 3px; } + /* line 70, ../sass/items/_item.scss */ + .items-holder .item.grid-item .bar.top-bar.abs .left .icon.l-link-icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon.l-link-icon { + color: #49dedb; } + /* line 76, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.bottom-bar.abs { top: auto; height: 30px; padding: 5px; } - /* line 79, ../sass/items/_item.scss */ + /* line 82, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main { line-height: 160px; z-index: 1; } - /* line 85, ../sass/items/_item.scss */ + /* line 88, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type { overflow: false; position: absolute; @@ -204,17 +207,17 @@ bottom: auto; height: 102px; top: 30px; } - /* line 97, ../sass/items/_item.scss */ + /* line 100, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type .l-link-icon { - color: #09948f; + color: #1a8e8b; height: 36px; line-height: 36px; position: absolute; font-size: 32px; - right: -10px; + right: -13px; bottom: -10px; z-index: 2; } - /* line 110, ../sass/items/_item.scss */ + /* line 112, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-open { -moz-transition-property: "opacity"; -o-transition-property: "opacity"; @@ -234,17 +237,17 @@ width: 50px; pointer-events: none; text-align: right; } - /* line 122, ../sass/items/_item.scss */ + /* line 124, ../sass/items/_item.scss */ .items-holder .item.grid-item .title { text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; color: #cccccc; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 130, ../sass/items/_item.scss */ + /* line 132, ../sass/items/_item.scss */ .items-holder .item.grid-item .details { font-size: 0.8em; } - /* line 133, ../sass/items/_item.scss */ + /* line 135, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -281,15 +284,15 @@ /* line 160, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected.btn-menu .invoke-menu { color: #52d4ff; } - /* line 138, ../sass/items/_item.scss */ + /* line 140, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { color: #80dfff; } - /* line 139, ../sass/items/_item.scss */ + /* line 141, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-main .item-open { color: #80dfff; } - /* line 140, ../sass/items/_item.scss */ + /* line 142, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .title { color: white; } - /* line 142, ../sass/items/_item.scss */ + /* line 144, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected:hover .item-main .item-type { color: white !important; } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 614a74df81..ec69f0ebc3 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -180,7 +180,7 @@ ul.tree { /* line 75, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon .icon.l-link-icon { text-shadow: black 0 1px 2px; - color: #5bf5ef; + color: #49dedb; position: absolute; font-size: 0.5em; right: -5px; diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 1cb6b20fda..c9c3374f76 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -42,7 +42,7 @@ $colorKeySelectedBg: #005177; $colorKeyFg: #fff; $colorAlt1: #ffc700; $colorAlert: #ff3c00; -$colorIconLink: #5bf5ef; +$colorIconLink: #49dedb; $colorPausedBg: #c56f01; $colorPausedFg: #fff; $colorCreateBtn: $colorKey; diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index c0f40a729a..69fdf7c472 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -83,8 +83,4 @@ .super-menu.menu.dropdown .icon { //font-size: $menuLineH * 0.95 // Normalizing for new icomoon symbols font -} - -.l-link-icon { -} - +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index edfdc619a2..650585b25d 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -66,7 +66,10 @@ .left, .right { width: auto; .icon { - margin-left: $interiorMargin; + margin-left: $interiorMarginSm; + &.l-link-icon { + color: $colorIconLink; + } } } } @@ -95,14 +98,13 @@ top: $iconMargin - 10; //line-height: $lh; .l-link-icon { - //@include test(blue); - //@include trans-prop-nice("color", $transTime); - color: darken($colorIconLink, 35%); + // When the link icon is in the item-type icon holder + color: darken($colorIconLink, 25%); height: 36px; line-height: 36px; position: absolute; font-size: 32px; - right: -10px; + right: -13px; bottom: -10px; z-index: 2; } From 2a032bf66d002379a5f75ccd01532ce1e1e2a94d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 1 Jul 2015 09:48:35 -0700 Subject: [PATCH 4/5] [Frontend] CSS and font updates ONLY from open1423 WTD-1423 Cherry-pick this into open1404 to get latest fonts and CSS into open-master; --- platform/commonUI/general/res/css/forms.css | 6 +- platform/commonUI/general/res/css/items.css | 22 ++-- .../general/res/css/theme-espresso.css | 110 +++++++++--------- platform/commonUI/general/res/css/tree.css | 62 +++++----- .../symbols/iconmoon.io-WTD-Symbols-v2.0.json | 72 ++++++++---- .../general/res/fonts/symbols/wtdsymbols.eot | Bin 9860 -> 10072 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 3 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 9684 -> 9896 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 9760 -> 9972 bytes .../commonUI/general/res/sass/_icons.scss | 74 ++++++------ .../commonUI/general/res/sass/_mixins.scss | 10 ++ .../general/res/sass/items/_item.scss | 10 +- .../commonUI/general/res/sass/tree/_tree.scss | 54 ++++----- 13 files changed, 229 insertions(+), 194 deletions(-) diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index bc7cbac350..3bb97a0f77 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -391,7 +391,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -400,10 +400,10 @@ input[type="text"] { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .form-control.select.btn-menu .invoke-menu { color: #757575; } /* line 29, ../sass/forms/_selects.scss */ diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 4b3ac6f8b9..c0ba5edecf 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -136,7 +136,7 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzcwNzA3MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -145,17 +145,17 @@ background-image: -webkit-linear-gradient(#707070, #636363); background-image: linear-gradient(#707070, #636363); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover.btn-menu .invoke-menu { color: #949494; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .items-holder .item.grid-item.btn-menu .invoke-menu { color: #828282; } /* line 46, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: #0099cc !important; } /* line 48, ../sass/items/_item.scss */ - .items-holder .item.grid-item:hover .item-main .item-type .l-link-icon { + .items-holder .item.grid-item:hover .item-main .item-type .l-icon-link { color: #49dedb; } /* line 52, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-open { @@ -179,7 +179,7 @@ .items-holder .item.grid-item .bar.top-bar.abs .left .icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon { margin-left: 3px; } /* line 70, ../sass/items/_item.scss */ - .items-holder .item.grid-item .bar.top-bar.abs .left .icon.l-link-icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon.l-link-icon { + .items-holder .item.grid-item .bar.top-bar.abs .left .icon.l-icon-link, .items-holder .item.grid-item .bar.top-bar.abs .right .icon.l-icon-link { color: #49dedb; } /* line 76, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.bottom-bar.abs { @@ -208,14 +208,14 @@ height: 102px; top: 30px; } /* line 100, ../sass/items/_item.scss */ - .items-holder .item.grid-item .item-main .item-type .l-link-icon { + .items-holder .item.grid-item .item-main .item-type .l-icon-link { color: #1a8e8b; height: 36px; line-height: 36px; position: absolute; font-size: 32px; - right: -13px; - bottom: -10px; + left: 0px; + bottom: 10px; z-index: 2; } /* line 112, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-open { @@ -269,7 +269,7 @@ color: #999; display: inline-block; color: #80dfff; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJlY2JmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzE0YzRmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -278,10 +278,10 @@ background-image: -webkit-linear-gradient(#2ecbff, #14c4ff); background-image: linear-gradient(#2ecbff, #14c4ff); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover.btn-menu .invoke-menu { color: #75ddff; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected.btn-menu .invoke-menu { color: #52d4ff; } /* line 140, ../sass/items/_item.scss */ diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index bc8e713630..acf68b7037 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -92,7 +92,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -113,38 +113,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1063,27 +1063,33 @@ mct-container { text-shadow: none; display: inline-block; } -/* line 60, ../sass/_icons.scss */ +/* line 57, ../sass/_icons.scss */ .btn-menu .invoke-menu, .icon.major .invoke-menu { margin-left: 3px; } -/* -.object-header .type-icon { - color: $colorKey; - margin-right: $interiorMarginSm; -} -*/ -/* line 72, ../sass/_icons.scss */ +/* line 62, ../sass/_icons.scss */ .menu .type-icon, .tree-item .type-icon, .super-menu.menu .type-icon { position: absolute; } -/* line 80, ../sass/_icons.scss */ +/* line 68, ../sass/_icons.scss */ .tree-item .type-icon { font-size: 16px; } +/* line 72, ../sass/_icons.scss */ +.l-icon-link:before { + content: "\f4"; } + +/* line 76, ../sass/_icons.scss */ +.l-icon-alert { + display: none !important; } + /* line 78, ../sass/_icons.scss */ + .l-icon-alert:before { + color: #ff3c00; + content: "!"; } + /*.s-limit-upr, .s-limit-lwr { $a: 0.5; @@ -1434,7 +1440,7 @@ mct-container { color: #999; display: inline-block; color: #ccf2ff; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.major:not(.disabled):hover, .s-btn.major:not(.disabled):hover, .major.icon-btn:not(.disabled):hover, @@ -1446,13 +1452,13 @@ mct-container { background-image: -webkit-linear-gradient(#2ecbff, #14c4ff); background-image: linear-gradient(#2ecbff, #14c4ff); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.major:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.major:not(.disabled):hover.btn-menu .invoke-menu, .major.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, .major.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { color: #75ddff; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.major.btn-menu .invoke-menu, .s-btn.major.btn-menu .invoke-menu, .major.btn-menu.icon-btn .invoke-menu, @@ -1482,7 +1488,7 @@ mct-container { border-top: 1px solid #2ecbff; color: #ccf2ff; display: inline-block; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.major:hover:not(.disabled):hover, .s-btn.major:hover:not(.disabled):hover, .major.icon-btn:hover:not(.disabled):hover, @@ -1494,13 +1500,13 @@ mct-container { background-image: -webkit-linear-gradient(#47d1ff, #2ecbff); background-image: linear-gradient(#47d1ff, #2ecbff); color: white; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.major:hover:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.major:hover:not(.disabled):hover.btn-menu .invoke-menu, .major.icon-btn:hover:not(.disabled):hover.btn-menu .invoke-menu, .major.s-icon-btn:hover:not(.disabled):hover.btn-menu .invoke-menu { color: #8fe3ff; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.major:hover.btn-menu .invoke-menu, .s-btn.major:hover.btn-menu .invoke-menu, .major.icon-btn:hover.btn-menu .invoke-menu, @@ -1536,7 +1542,7 @@ mct-container { border-top: 1px solid #8a8a8a; color: #cccccc; display: inline-block; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.subtle:not(.disabled):hover, .s-btn.subtle:not(.disabled):hover, .subtle.icon-btn:not(.disabled):hover, @@ -1548,13 +1554,13 @@ mct-container { background-image: -webkit-linear-gradient(#969696, #8a8a8a); background-image: linear-gradient(#969696, #8a8a8a); color: #f0f0f0; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.subtle:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.subtle:not(.disabled):hover.btn-menu .invoke-menu, .subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, .subtle.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { color: #bababa; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.subtle.btn-menu .invoke-menu, .s-btn.subtle.btn-menu .invoke-menu, .subtle.btn-menu.icon-btn .invoke-menu, @@ -1587,7 +1593,7 @@ mct-container { border-top: 1px solid #575757; color: #999; display: inline-block; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.very-subtle:not(.disabled):hover, .btn.s-very-subtle:not(.disabled):hover, .s-btn.very-subtle:not(.disabled):hover, .very-subtle.icon-btn:not(.disabled):hover, @@ -1602,7 +1608,7 @@ mct-container { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.very-subtle:not(.disabled):hover.btn-menu .invoke-menu, .btn.s-very-subtle:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.very-subtle:not(.disabled):hover.btn-menu .invoke-menu, .very-subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, @@ -1611,7 +1617,7 @@ mct-container { .s-very-subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, .s-very-subtle.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.very-subtle.btn-menu .invoke-menu, .btn.s-very-subtle.btn-menu .invoke-menu, .s-btn.very-subtle.btn-menu .invoke-menu, .very-subtle.btn-menu.icon-btn .invoke-menu, @@ -1647,7 +1653,7 @@ mct-container { border-top: 1px solid #fe9510; color: #fff; display: inline-block; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.very-subtle.paused:not(.disabled):hover, .btn.s-very-subtle.paused:not(.disabled):hover, .s-btn.very-subtle.paused:not(.disabled):hover, .very-subtle.paused.icon-btn:not(.disabled):hover, @@ -1662,7 +1668,7 @@ mct-container { background-image: -webkit-linear-gradient(#fea029, #fe9510); background-image: linear-gradient(#fea029, #fe9510); color: white; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, .btn.s-very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, .very-subtle.paused.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, @@ -1671,7 +1677,7 @@ mct-container { .s-very-subtle.paused.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, .s-very-subtle.paused.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { color: #fec070; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.very-subtle.paused.btn-menu .invoke-menu, .btn.s-very-subtle.paused.btn-menu .invoke-menu, .s-btn.very-subtle.paused.btn-menu .invoke-menu, .very-subtle.paused.btn-menu.icon-btn .invoke-menu, @@ -2133,7 +2139,7 @@ label.checkbox.custom { color: lighten($c, 10%); } }*/ } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2142,10 +2148,10 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn-menu.btn-menu .invoke-menu { color: #757575; } /* line 285, ../sass/controls/_controls.scss */ @@ -2277,7 +2283,7 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2286,13 +2292,13 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .slider .knob.btn-menu .invoke-menu { color: #757575; } - /* line 176, ../sass/_mixins.scss */ + /* line 186, ../sass/_mixins.scss */ .slider .knob:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -2316,7 +2322,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 198, ../sass/_mixins.scss */ + /* line 208, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -2488,14 +2494,14 @@ label.checkbox.custom { padding: 3px 0; position: absolute; z-index: 10; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .menu-element .menu.btn-menu .invoke-menu { color: #828282; } /* line 37, ../sass/controls/_menus.scss */ .menu-element .menu ul { margin: 0; padding: 0; } - /* line 266, ../sass/_mixins.scss */ + /* line 276, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2551,7 +2557,7 @@ label.checkbox.custom { border-top: 1px solid #919191; color: #999; display: inline-block; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .menu-element .context-menu.btn-menu .invoke-menu, .menu-element .super-menu.btn-menu .invoke-menu { color: #b0b0b0; } @@ -3414,7 +3420,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -3423,10 +3429,10 @@ input[type="text"] { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .form-control.select.btn-menu .invoke-menu { color: #757575; } /* line 29, ../sass/forms/_selects.scss */ @@ -4044,7 +4050,7 @@ input[type="text"] { bottom: 15%; left: 15%; z-index: 101; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .overlay > .holder.btn-menu .invoke-menu { color: #757575; } /* line 45, ../sass/overlay/_overlay.scss */ @@ -4552,7 +4558,7 @@ input[type="text"] { right: 0; width: auto; height: 5px; } - /* line 176, ../sass/_mixins.scss */ + /* line 186, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4576,7 +4582,7 @@ input[type="text"] { top: 2px; left: 5px; right: 5px; } - /* line 198, ../sass/_mixins.scss */ + /* line 208, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4606,7 +4612,7 @@ input[type="text"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 176, ../sass/_mixins.scss */ + /* line 186, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4630,7 +4636,7 @@ input[type="text"] { left: 2px; bottom: 5px; top: 5px; } - /* line 198, ../sass/_mixins.scss */ + /* line 208, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index ec69f0ebc3..b5b16680c8 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -99,20 +99,20 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 22, ../sass/tree/_tree.scss */ +/* line 23, ../sass/tree/_tree.scss */ ul.tree { margin: 0; padding: 0; } - /* line 266, ../sass/_mixins.scss */ + /* line 276, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; padding: 0; } - /* line 24, ../sass/tree/_tree.scss */ + /* line 25, ../sass/tree/_tree.scss */ ul.tree li { display: block; position: relative; } - /* line 27, ../sass/tree/_tree.scss */ + /* line 28, ../sass/tree/_tree.scss */ ul.tree li span.tree-item { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -127,16 +127,16 @@ ul.tree { line-height: 1.5rem; margin-bottom: 3px; position: relative; } - /* line 38, ../sass/tree/_tree.scss */ + /* line 39, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .view-control { display: inline-block; margin-left: 5px; font-size: 0.75em; width: 10px; } - /* line 44, ../sass/tree/_tree.scss */ + /* line 45, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .view-control:hover { color: #ffc700; } - /* line 49, ../sass/tree/_tree.scss */ + /* line 50, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label { display: block; overflow: hidden; @@ -147,8 +147,8 @@ ul.tree { left: 0px; width: auto; height: auto; - left: 20px; } - /* line 55, ../sass/tree/_tree.scss */ + left: 15px; } + /* line 57, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon { overflow: false; position: absolute; @@ -160,32 +160,32 @@ ul.tree { height: auto; text-shadow: rgba(0, 0, 0, 0.6) 0 1px 2px; color: #0099cc; + left: 5px; right: auto; width: 1em; } - /* line 60, ../sass/tree/_tree.scss */ - ul.tree li span.tree-item .label .type-icon .alert { - text-shadow: rgba(0, 0, 0, 0.3) 0 1px 2px; - background: #333; - color: #ff3c00; - font-size: 0.7em; - margin-top: -3px; - top: 0; - right: auto; - bottom: auto; - left: 9px; - height: auto; - width: auto; - position: absolute; - z-index: 2; } - /* line 75, ../sass/tree/_tree.scss */ - ul.tree li span.tree-item .label .type-icon .icon.l-link-icon { + /* line 65, ../sass/tree/_tree.scss */ + ul.tree li span.tree-item .label .type-icon .icon.l-icon-link, ul.tree li span.tree-item .label .type-icon .icon.l-icon-alert { text-shadow: black 0 1px 2px; - color: #49dedb; position: absolute; - font-size: 0.5em; - right: -5px; - bottom: -8px; z-index: 2; } + /* line 71, ../sass/tree/_tree.scss */ + ul.tree li span.tree-item .label .type-icon .icon.l-icon-alert { + color: #ff3c00; + font-size: 8px; + line-height: 8px; + height: 8px; + width: 8px; + top: 1px; + right: -2px; } + /* line 77, ../sass/tree/_tree.scss */ + ul.tree li span.tree-item .label .type-icon .icon.l-icon-link { + color: #49dedb; + font-size: 8px; + line-height: 8px; + height: 8px; + width: 8px; + left: -3px; + bottom: 5px; } /* line 86, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .title-label { overflow: hidden; @@ -197,7 +197,7 @@ ul.tree { width: auto; height: auto; display: block; - left: 25px; + left: 30px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } diff --git a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json b/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json index 45b1da9c33..e2215bed12 100644 --- a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json +++ b/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json @@ -1,8 +1,8 @@ { "metadata": { "name": "WTD Symbols v2.", - "lastOpened": 1435266597671, - "created": 1435266594435 + "lastOpened": 1435765696898, + "created": 1435764071891 }, "iconSets": [ { @@ -352,7 +352,7 @@ "tempChar": "" }, { - "order": 45, + "order": 75, "id": 30, "prevSize": 32, "code": 244, @@ -415,13 +415,21 @@ "name": "icon-object", "tempChar": "" }, + { + "order": 73, + "id": 77, + "prevSize": 32, + "code": 63, + "name": "icon-object-unknown", + "tempChar": "" + }, { "order": 53, "id": 22, "prevSize": 32, "code": 86, "name": "icon-packet", - "tempChar": "" + "tempChar": "" }, { "order": 54, @@ -429,7 +437,7 @@ "prevSize": 32, "code": 234, "name": "icon-page", - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -437,7 +445,7 @@ "prevSize": 32, "code": 241, "name": "icon-pause", - "tempChar": "" + "tempChar": "" }, { "order": 56, @@ -445,7 +453,7 @@ "prevSize": 32, "code": 112, "name": "icon-pencil", - "tempChar": "" + "tempChar": "" }, { "order": 65, @@ -453,7 +461,7 @@ "prevSize": 32, "code": 79, "name": "icon-people", - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -461,7 +469,7 @@ "prevSize": 32, "code": 239, "name": "icon-play", - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -469,7 +477,7 @@ "prevSize": 32, "code": 233, "name": "icon-plot-resource", - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -477,7 +485,7 @@ "prevSize": 32, "code": 43, "name": "icon-plus", - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -485,7 +493,7 @@ "prevSize": 32, "code": 45, "name": "icon-minus", - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -493,7 +501,7 @@ "prevSize": 32, "code": 54, "name": "icon-sine", - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -501,7 +509,7 @@ "prevSize": 32, "code": 228, "name": "icon-T", - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -509,7 +517,7 @@ "prevSize": 32, "code": 116, "name": "icon-telemetry-panel", - "tempChar": "" + "tempChar": "" }, { "order": 64, @@ -517,7 +525,7 @@ "prevSize": 32, "code": 84, "name": "icon-telemetry", - "tempChar": "" + "tempChar": "" }, { "order": 18, @@ -525,7 +533,7 @@ "prevSize": 32, "code": 246, "name": "icon-thumbs-strip", - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -533,7 +541,7 @@ "prevSize": 32, "code": 83, "name": "icon-timeline", - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -541,7 +549,7 @@ "prevSize": 32, "code": 245, "name": "icon-timer", - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -549,7 +557,7 @@ "prevSize": 32, "code": 90, "name": "icon-trash", - "tempChar": "" + "tempChar": "" }, { "order": 70, @@ -557,7 +565,7 @@ "prevSize": 32, "code": 229, "name": "icon-two-parts-both", - "tempChar": "" + "tempChar": "" }, { "order": 71, @@ -565,7 +573,7 @@ "prevSize": 32, "code": 231, "name": "icon-two-parts-one-only", - "tempChar": "" + "tempChar": "" }, { "order": 72, @@ -573,7 +581,7 @@ "prevSize": 32, "code": 120, "name": "icon-x-heavy", - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -581,7 +589,7 @@ "prevSize": 32, "code": 58946, "name": "icon-x", - "tempChar": "" + "tempChar": "" } ], "id": 2, @@ -1289,7 +1297,7 @@ { "id": 30, "paths": [ - "M832 0h-640c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192zM832 640l-128-128-512 320 320-512-128-128h448v448z" + "M1024 512l-512-512v307.2l-512 204.8v256h512v256z" ], "attrs": [ {} @@ -1410,6 +1418,20 @@ "icon-object" ] }, + { + "id": 77, + "paths": [ + "M510-2l-512 320v384l512 320 512-320v-384l-512-320zM585.4 859.2c-21.2 20.8-46 30.8-76 30.8-31.2 0-56.2-9.8-76.2-29.6-20-20-29.6-44.8-29.6-76.2 0-30.4 10.2-55.2 31-76.2s45.2-31.2 74.8-31.2c29.6 0 54.2 10.4 75.6 32s31.8 46.4 31.8 76c-0.2 29-10.8 54-31.4 74.4zM638.2 546.6c-23.6 11.8-37.4 22-43.4 32.4-3.6 6.2-6 14.8-7.4 26.8v41h-161.4v-44.2c0-40.2 4.4-69.8 13-88 8-17.2 22.6-30.2 44.8-40l34.8-15.4c32-14.2 48.2-35.2 48.2-62.8 0-16-6-30.4-17.2-41.8-11.2-11.2-25.6-17.2-41.6-17.2-24 0-54.4 10-62.8 57.4l-2.2 12.2h-147l1.4-16.2c4-44.6 17-82.4 38.8-112.2 19.6-27 45.6-48.6 77-64.6s64.6-24 98.2-24c60.6 0 110.2 19.4 151.4 59.6 41.2 40 61.2 88 61.2 147.2 0 70.8-28.8 121.4-85.8 149.8z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-object-unknown" + ] + }, { "id": 22, "paths": [ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index a341f741c908067f4310726966890594b5ee507f..278460b5a892863f3aa8a67a1b5d1bce9938b561 100755 GIT binary patch delta 747 zcmYLGT}TvB6h3!mc7Aq#w{~Z@MR<84FD)-E|*gT_UIuqdy`Lsx^NW(p*r=p4JBg zF(|i*^1-ACBBDZA(5xON3p2|?kmx}|LVAb|dNC|wZg-LB-g7v7=R4=)+;az;KOJOG zQ~}&K3T%SOKN?LI(uMrm#}xonL40p#rZ)!w8US^gM831@Vn?CnY?|OKKxkXGJ=4Y( zikAVxBZN<6NrJN&h2S}YquK7heuJae2`&-6`mUZcnTE>LPeO$VKh~Y;&p``ZAow}K zp>vt;c3*Jm`$>{mCJhgAJ-vNE6AFwWGmCDaMw6wk#y{Zqcmcn~^Y{&(!>{ox{1U&w z7Ji1G;%WQ@PvJ>?3?Icu{0IE|{3*YaXdrWuN}DSbS9H-sOrFLzo}q1e23QEfVE_TS zh@s62iiC}-S`@EOG^9}7F5MeI9yiMof+OaMY!HnoMM}zrkua;G2&vt${~gG-fg;z2 zCe`qI4OLZCO^xZ^n5N}5O^ds9hGx(mj%9UM#OD)u!6R)lILbt{TT`pNzMWfYn}WeW zbu~R>TlRo$p)?vm=|6Whm7JKbtfUepL)T*}O7a@-kcI6v!5Ue1bDA^ckvzO0=ut@v zCv{IqlBCLDVE>MIlU}^ZUGo|U09y>u7Fj}h0S?zz7enSP&y6fH`N9GQT+9c5Q5DJ2 zNBL9g?llmZ@_)eM^wgz)(YzjRK+Wd6aEiq?p<`w`QfD?sKIbj!H=Ur*)02#k*~4@& zH<*$m?Z`Q9J4$Q^JIwyz4soO0J#LkE@~!*?|4ncTHA1WK*y(qUILDnOF)Fr-{o)nz zp*SzDNKF;e;@dpTWQ&ACZxon8Ma87R|t*cmODGmH`xCKfuBZ`GY@W$6L7bO~f#LrF76#@6 zKrf0<{vah{s?N!%t|-Xt@VCLgu+X0gOg8*uV036;JivUQ&>tcGx1r(R0Valqe+~?r z{S|&P$;4Nu7{>G4d}ZKf0XdlA;`WTUFnV%|vN@yAS8z>&q##j%Ft5vLyKEG_{q zIj$V8C0viVesJ?~>u`HZyWDC-fMgud?tJ) neAoC{_&xaJ_}2g(#K^$F!{EbE$^eWeAYcN9i}2=t)su_>>@B3z diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg index 0eef723d78..9c9d712d2d 100755 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -18,6 +18,7 @@ + @@ -72,7 +73,7 @@ - + diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index e56f67ce32b7029747b46962a71a4e634f6bc831..b113a531a4551bf778e4357d799af1542a883677 100755 GIT binary patch delta 730 zcmYLGTS!z<6g}tOJNNyXa_&rn&eORTnp8SEA2ALQR188d{1K`#9|LI)C}m&cM}ZjR z*oE-Jq6i|QLKyH-ecUX}43j|ml8BIkn4%xUBJODq5}mU*o3+>8i+%Q4P2X=Vg!3Ek zKO%%H!4LLi266}?9UqyT(V780DzsDKv% zS7-YMhfI#%1Y82W#@_z3ndYkGPoP4;PxfVoa;P0$1pEwe=zONH%NJbzb_x<}(C{GF zKQM@BppZE-K6?|lSZ#PLzCzxTW%7nBk=JCAydp2j3-X-U_U@=p2ZMpyT6*5GongnuDLjl*f9~oU zoS3hyq=AxY7%>eec%64C!mhetouX85x)}1v9$pZPYFUpY3{Oaw<*H!d@a}lpD1KqD zdrgcGu^B|$u!QmgT<)-&fqBbwV;d%4UM7eXR|3DN%EZK@{Aq3f29lWacc6E3Ggtma zYdzeITdm4Sk|hq%F{==1u*M=E@;3FGZlW*H(~OTfz;rV=n35~y%DHa4N^Cbf%KqSv zaueJ=Zk-qT4t|RNDu_az&>=h){bE79C6=UWsY4o)u1OE2C23vu$>SJgOv=%gU6p npsXsNlueaY18SQ(qE4!7T2kxPrnCjU0>SGj)LQ%={fz$t))B&7 delta 511 zcmZ4Cd&PT#V*T@LR~Q%=Wq{ZvJ+Ziefq_AQfq^LjNOPp;RHk)(I3Wz=XD~3xM`WZX zrm*#jMKdrc9stUlWdH@(53uk8`9FYsm5khy3MDq?UknUNAoC1z@{<$wwABL`7?gd0 z^0RUiD+(B*7|MbC7eKy3USe*lg#4AaaX`HsKn<%3@{3Ctn1NCZs#_-Rn9FE4IgGL2 z^xXfm|IhqC_5bAm6aSC@KlcCd|3m)|{NMk7*Z-aWcl_V}f7}19|AYSr{STD#kaCl< zmEr^%!8low$zieq6Z_^wrVf_PFWD!E^D;3o{6E0Lzk-!vZa!`uZZGZ> z?it)$xS#NF@$BGb;WglO;|<|W;;rCqBd@fUyJwOu%pv-h5x>BqIP6x1U@9 diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff index 88de29cc857dc01ff94549f48566b35ca18298c0..5989698d985a8edf4a4779ef52ba8d97e4303da9 100755 GIT binary patch delta 778 zcmYLHOGs2v82-<_ckW~Eb86g%7uiq2#XdP6>?AKYSB6W$Itoy@BFWGh7Yea>ODv5 z>j42-krfcv^+TWv7bra+4d+%rF1Dw-vH;Wwaq)klwP!B15!(|0{|*cJrgO=3YpMkx zus}G~7TA38YMK}Uf=+S{S>OytNq2Pj5?dSqRauB|^v_J^S;7lt2xrJbO-bTMN2)g) z1qfS7{p)Cgp7W`WR$?Pb(IX4K`LCz5on76e`uY6YeN}As<9B!t&*B;U7Qex- z@hkiizrY55j-TO4{1i{%aeNY=z{kCZya&7quN`PWq~+Q|A0-w?seUF$V-ru&COri# z_~00TfE+~7W(5TUk+KRDtE#R^pvt|vyA-*cEJqw15m#`-QHK(QViAJ@Rz*R=-H`t` zkZA%%wh0Yt#O;o#s-kLYSa*jtEvIQ(%%L+hgYIxFt2=@okH8BqX;Xxw3W#=UYMI-! zXG=wc&sSPrPEVPJ*=HIkiTY4-?VhHR74}$>R1zto>tPked5yQp!p^8KD$7nzv-@3= zix&hvBx!-T?($2LRN^Z=xGUD67c04&?g;r7*kFJ*$Plan*c{s(45`?r>o-5G>3FzU2(+H(gC% zq{kT#v!7{WZZXTYq%CV3wk@-5>;U_nJIW1m54a`X&NuU8{1?G4M1^MIvE6IGVZUu( z7DHmQ*ehNWN5mO%N%BZlQj0Vo$K}iNm^>}d%b(<*3agYVr<8tWNLf%5YDOJXr!^;# N?kH$1?hAcJe*l63$5j9T delta 565 zcmez3yTC`R+~3WOfsp|S)D#%FLA2@>2Byh{OkxvtRO_E#yON$*T)@DmS~v-OHaX8;9(VlF_w3J9|wVByWkEvW#C zWiT)>8i2488}qN6{A8dyWwe{Th_T=F-2b!x&-_32|K$G@|BwGa_W$tzL;nx_-~WHt z|DFGL{NMh6+yAZqgZ~Hp50vtda+9)^;$&cEU<7*EW^w})_vW=s9W0woIVOmQF)=Xw zKfuDke1JiKK^$nEq7s{^poo~UqLG=YpoyBYpgJd`x}qSn!`}w~!a{#0Fxl{rfzhFX z@c{FILVtw#--d>N2bdTd{y8vgel7o#NhZEJ#W0@V<|_j?3(#{63>UX&yoJ$|l+77^ zCR-@mF)^r4-k@wedA;(z`YNVvOy8Kzm}f8_Vt&RV#*)KwfaL?L0&5QIGd3=^0=5h6 z66|X1DePVBk2nlCvN*ap)^I%H)Z?7RCBP-emBY1!>k-!vZa!`uZZGZ>?it)$xS#NF z@$BGb;WglO;|<|W;;rCq Date: Wed, 1 Jul 2015 09:50:53 -0700 Subject: [PATCH 5/5] [Frontend] Markup updates to label and grid-item WTD-1423 Depends on CSS and font updates in 2a032bf --- .../commonUI/browse/res/templates/items/grid-item.html | 9 +++++---- platform/commonUI/general/res/templates/label.html | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html index 6372b8c393..6d041b48b9 100644 --- a/platform/commonUI/browse/res/templates/items/grid-item.html +++ b/platform/commonUI/browse/res/templates/items/grid-item.html @@ -27,17 +27,18 @@
- +
P
- - ô
{{type.getGlyph()}} - ô +
}
diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html index da63abd07a..61905cb7bf 100644 --- a/platform/commonUI/general/res/templates/label.html +++ b/platform/commonUI/general/res/templates/label.html @@ -23,10 +23,11 @@ {{type.getGlyph()}} - - ô - - + + {{model.name}}