diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 08b8dd08c8..89a8c10bce 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -65,7 +65,7 @@ "key": "grid-item", "templateUrl": "templates/items/grid-item.html", "uses": [ "type", "action" ], - "gestures": [ "info", "menu" ] + "gestures": [ "info" ] }, { "key": "object-header", diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html index 24c10f88d0..e64afd4a9f 100644 --- a/platform/commonUI/browse/res/templates/items/grid-item.html +++ b/platform/commonUI/browse/res/templates/items/grid-item.html @@ -28,7 +28,7 @@
-
P
+
P
diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 4d6abee562..0e822f901d 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -144,61 +144,88 @@ .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 45, ../sass/items/_item.scss */ - .items-holder .item.grid-item:hover .item-main .item-open { - display: block; } /* line 49, ../sass/items/_item.scss */ + .items-holder .item.grid-item:hover .item-main .item-open { + opacity: 1; } + /* line 54, ../sass/items/_item.scss */ .items-holder .item.grid-item .contents { top: 5px; right: 5px; bottom: 5px; left: 5px; } - /* line 53, ../sass/items/_item.scss */ + /* line 58, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs { bottom: auto; height: 20px; line-height: 20px; z-index: 5; } - /* line 58, ../sass/items/_item.scss */ + /* line 63, ../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 60, ../sass/items/_item.scss */ + /* line 65, ../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 65, ../sass/items/_item.scss */ + /* line 70, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.bottom-bar.abs { top: auto; - height: 40px; + height: 30px; padding: 5px; } - /* line 71, ../sass/items/_item.scss */ + /* line 76, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main { + line-height: 160px; z-index: 1; } - /* line 79, ../sass/items/_item.scss */ + /* line 82, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type { color: #737373; text-align: center; - font-size: 7em; - line-height: 180px; } - /* line 85, ../sass/items/_item.scss */ + font-size: 6em; } + /* line 88, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-open { - display: none; - font-size: 5em; - line-height: 180px; + -moz-transition-property: "opacity"; + -o-transition-property: "opacity"; + -webkit-transition-property: "opacity"; + transition-property: "opacity"; + -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; + opacity: 0; + font-size: 3em; left: auto; - width: 30px; } - /* line 93, ../sass/items/_item.scss */ + width: 50px; + pointer-events: none; + text-align: right; } + /* line 100, ../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 101, ../sass/items/_item.scss */ + /* line 108, ../sass/items/_item.scss */ .items-holder .item.grid-item .details { font-size: 0.8em; } - /* line 104, ../sass/items/_item.scss */ + /* line 111, ../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%; @@ -235,15 +262,15 @@ /* line 160, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected.btn-menu .invoke-menu { color: #52d4ff; } - /* line 109, ../sass/items/_item.scss */ + /* line 116, ../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 110, ../sass/items/_item.scss */ + /* line 117, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-main .item-open { color: #80dfff; } - /* line 111, ../sass/items/_item.scss */ + /* line 118, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .title { color: white; } - /* line 113, ../sass/items/_item.scss */ + /* line 120, ../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 ef43a9da06..3fe6b78639 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -84,7 +84,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, @@ -105,38 +105,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; } @@ -504,7 +504,7 @@ mct-container { .user-environ .browse-area, .user-environ .edit-area, .user-environ .editor { - top: 40px; + top: 34px; right: 5px; bottom: 30px; left: 5px; } @@ -526,24 +526,29 @@ mct-container { top: 40px; } /* line 121, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar { - top: auto; + overflow: hidden; + position: absolute; + top: 5px; right: 5px; bottom: 5px; left: 5px; + width: auto; + height: auto; + top: auto; height: 20px; } - /* line 127, ../sass/user-environ/_layout.scss */ + /* line 125, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar .status-holder { right: 110px; } - /* line 130, ../sass/user-environ/_layout.scss */ + /* line 128, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar .app-logo { left: auto; width: 105px; } -/* line 137, ../sass/user-environ/_layout.scss */ +/* line 135, ../sass/user-environ/_layout.scss */ .cols { overflow: hidden; *zoom: 1; } - /* line 139, ../sass/user-environ/_layout.scss */ + /* line 137, ../sass/user-environ/_layout.scss */ .cols .col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -554,103 +559,100 @@ mct-container { margin-left: 1.5%; padding-left: 5px; position: relative; } - /* line 147, ../sass/user-environ/_layout.scss */ + /* line 145, ../sass/user-environ/_layout.scss */ .cols .col:first-child { margin-left: 0; padding-left: 0; } - /* line 154, ../sass/user-environ/_layout.scss */ + /* line 152, ../sass/user-environ/_layout.scss */ .cols.cols-2 .col-1 { min-width: 250px; width: 48.5%; } - /* line 160, ../sass/user-environ/_layout.scss */ + /* line 158, ../sass/user-environ/_layout.scss */ .cols.cols-2-ff .col-100px { width: 100px; } - /* line 167, ../sass/user-environ/_layout.scss */ + /* line 165, ../sass/user-environ/_layout.scss */ .cols.cols-6 .col-1 { min-width: 83.33333px; width: 15.16667%; } - /* line 173, ../sass/user-environ/_layout.scss */ + /* line 171, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-1 { min-width: 31.25px; width: 4.75%; } - /* line 176, ../sass/user-environ/_layout.scss */ + /* line 174, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-2 { min-width: 62.5px; width: 11%; } - /* line 179, ../sass/user-environ/_layout.scss */ + /* line 177, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-7 { min-width: 218.75px; width: 42.25%; } - /* line 185, ../sass/user-environ/_layout.scss */ + /* line 183, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-2 { min-width: 31.25px; width: 4.75%; } - /* line 188, ../sass/user-environ/_layout.scss */ + /* line 186, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-15 { min-width: 234.375px; width: 45.375%; } - /* line 192, ../sass/user-environ/_layout.scss */ + /* line 190, ../sass/user-environ/_layout.scss */ .cols .l-row { overflow: hidden; *zoom: 1; padding: 5px 0; } -/* line 198, ../sass/user-environ/_layout.scss */ +/* line 196, ../sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 201, ../sass/user-environ/_layout.scss */ + /* line 199, ../sass/user-environ/_layout.scss */ .pane.treeview .create-btn-holder { bottom: auto; top: 0; - height: 30px; } - /* line 204, ../sass/user-environ/_layout.scss */ + height: 24px; } + /* line 202, ../sass/user-environ/_layout.scss */ .pane.treeview .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 209, ../sass/user-environ/_layout.scss */ + /* line 207, ../sass/user-environ/_layout.scss */ .pane.treeview .tree-holder { overflow: auto; - top: 35px; } - /* line 217, ../sass/user-environ/_layout.scss */ + top: 34px; } + /* line 214, ../sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .btn-menu span.left.l-click-area, .btn-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .btn-menu span.right.l-click-area, .btn-menu .pane.items .object-browse-bar span.right.l-click-area { top: auto; } - /* line 221, ../sass/user-environ/_layout.scss */ - .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .btn-menu span.right.l-click-area, .btn-menu .pane.items .object-browse-bar span.right.l-click-area { - bottom: 5px; } - /* line 225, ../sass/user-environ/_layout.scss */ + /* line 219, ../sass/user-environ/_layout.scss */ .pane.items .object-holder { - top: 35px; } - /* line 230, ../sass/user-environ/_layout.scss */ + top: 34px; } + /* line 224, ../sass/user-environ/_layout.scss */ .pane.edit-main .object-holder { top: 0; } - /* line 236, ../sass/user-environ/_layout.scss */ + /* line 230, ../sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 244, ../sass/user-environ/_layout.scss */ +/* line 238, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 247, ../sass/user-environ/_layout.scss */ + /* line 241, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 254, ../sass/user-environ/_layout.scss */ +/* line 248, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 256, ../sass/user-environ/_layout.scss */ + /* line 250, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 260, ../sass/user-environ/_layout.scss */ + /* line 254, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 262, ../sass/user-environ/_layout.scss */ + /* line 256, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 5px; } -/* line 271, ../sass/user-environ/_layout.scss */ +/* line 265, ../sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -1054,9 +1056,7 @@ mct-container { /* line 52, ../sass/_icons.scss */ .invoke-menu { text-shadow: none; - display: inline-block; - font-size: 0.8rem; - vertical-align: middle; } + display: inline-block; } /* line 60, ../sass/_icons.scss */ .btn-menu .invoke-menu, @@ -1073,13 +1073,11 @@ mct-container { .menu .type-icon, .tree-item .type-icon, .super-menu.menu .type-icon { - font-size: 1.12rem; - line-height: 1.582rem; position: absolute; } -/* line 81, ../sass/_icons.scss */ -.super-menu.menu.dropdown .icon { - font-size: 1.33rem; } +/* line 80, ../sass/_icons.scss */ +.tree-item .type-icon { + font-size: 16px; } /*.s-limit-upr, .s-limit-lwr { @@ -1357,17 +1355,12 @@ mct-container { .btn.lg, .btn.create-btn, .l-btn.lg, .l-btn.create-btn { - height: 25px; - line-height: 25px; + height: 24px; padding: 0 22.5px; } /* line 39, ../sass/controls/_buttons.scss */ .btn.create-btn .menu, .l-btn.create-btn .menu { margin-left: -7.5px; } - /* line 42, ../sass/controls/_buttons.scss */ - .btn.create-btn > .ui-symbol, - .l-btn.create-btn > .ui-symbol { - font-size: 1.1em; } /* line 46, ../sass/controls/_buttons.scss */ .btn.sm, .l-btn.sm { @@ -1694,10 +1687,6 @@ mct-container { .icon-btn.labeled, .s-icon-btn.labeled { padding: 0 3.75px; } - /* line 117, ../sass/controls/_buttons.scss */ - .icon-btn.labeled .icon, - .s-icon-btn.labeled .icon { - font-size: 1.5em; } /* line 120, ../sass/controls/_buttons.scss */ .icon-btn.labeled .title-label, .s-icon-btn.labeled .title-label { @@ -2004,15 +1993,6 @@ a.l-btn span { font-size: 11.25px; height: 25px; line-height: 25px; } - /* line 186, ../sass/controls/_controls.scss */ - .object-browse-bar .btn .icon:not(.invoke-menu), - .object-browse-bar .t-btn .icon:not(.invoke-menu), - .top-bar .buttons-main .btn .icon:not(.invoke-menu), - .top-bar .buttons-main .t-btn .icon:not(.invoke-menu), - .tool-bar .btn .icon:not(.invoke-menu), - .tool-bar .t-btn .icon:not(.invoke-menu) { - font-size: 150%; - vertical-align: middle; } /* line 194, ../sass/controls/_controls.scss */ label.checkbox.custom { @@ -2210,7 +2190,7 @@ label.checkbox.custom { color: white; } /* line 363, ../sass/controls/_controls.scss */ .object-header .label .type-icon { - font-size: 1.5em; + font-size: 120%; margin-right: 5px; vertical-align: middle; } @@ -3641,8 +3621,8 @@ input[type="text"] { /* line 89, ../sass/forms/_filter.scss */ .top-bar input.filter { font-size: .9em; - height: 30px; - line-height: 30px; + height: 24px; + line-height: 24px; margin-right: 5px; padding-left: 10px; padding-right: 10px; @@ -4177,7 +4157,7 @@ input[type="text"] { /* line 22, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar { color: gray; - font-size: 0.7em; + font-size: 0.65rem; line-height: 16px; } /* line 26, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar .status-holder { @@ -4219,9 +4199,7 @@ input[type="text"] { box-shadow: inset rgba(0, 0, 0, 0.5) 0 0 3px; text-shadow: rgba(0, 0, 0, 0.3) 0 0 2px; display: inline-block; - font-size: 1.25em; - vertical-align: middle; - margin-right: 5px; } + margin-right: 3px; } /* line 58, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator.ok { color: #009900; } @@ -4252,7 +4230,8 @@ input[type="text"] { *****************************************************************************/ /* line 22, ../sass/user-environ/_object-browse.scss */ .object-browse-bar { - height: 30px; } + height: 24px; + line-height: 24px; } /* line 26, ../sass/user-environ/_object-browse.scss */ .object-browse-bar .items-select .btn-menu { margin-right: 15px; } @@ -4555,7 +4534,7 @@ input[type="text"] { /* line 86, ../sass/helpers/_splitter.scss */ .browse-area .splitter { - top: 35px; } + top: 34px; } /* line 90, ../sass/helpers/_splitter.scss */ .edit-area .splitter { diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index b40a2aec6e..2582522f39 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -114,7 +114,7 @@ ul.tree { -webkit-transition: background-color 0.25s; transition: background-color 0.25s; display: block; - font-size: 0.80rem; + font-size: 0.80em; height: 1.4rem; line-height: 1.4rem; margin-bottom: 3px; @@ -123,6 +123,7 @@ ul.tree { 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 */ ul.tree li span.tree-item .view-control:hover { diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot old mode 100644 new mode 100755 index 0d7e45d06d..eba4be8dfc Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg old mode 100644 new mode 100755 index 0d525856b6..22d0f7ba46 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -1,260 +1,78 @@ - - -Created by FontForge 20090622 at Tue Jun 9 23:00:40 2015 - By deploy user -Copyright 2015 Adobe Systems Incorporated. All rights reserved. - + +Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf old mode 100644 new mode 100755 index b29f0fc015..43bf7b8af8 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff old mode 100644 new mode 100755 index 6d4330ac62..67be10cf6b Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff differ diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index feab47efab..e53d6d1b96 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -75,7 +75,7 @@ $ltGamma: 20%; $btnFontSizeToH: 0.45; // User Environment -$ueTopBarH: 30px; // Change to 45px when breadcrumb is enabled +$ueTopBarH: 24px; // Change to when breadcrumb is enabled $ueTopBarEditH: 30px; $ueTopBarBtnH: 35px; $ueFooterH: 20px; @@ -96,7 +96,7 @@ $ovrFooterH: 40px; //Items $ueBrowseGridItemLg: 200px; $ueBrowseGridItemTopBarH: 20px; -$ueBrowseGridItemBottomBarH: 40px; +$ueBrowseGridItemBottomBarH: 30px; $colorItemBase: lighten($colorBodyBg, 5%); $colorItemFg: lighten($colorItemBase, 20%); $colorItemSelected: $colorKey; diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 1b90e6f0d3..71be99d43a 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -53,8 +53,8 @@ //@include invokeMenu(); // $colorKey text-shadow: none; display: inline-block; - font-size: 0.8rem; - vertical-align: middle; + //font-size: 0.8rem;// Normalizing for new icomoon symbols font + //vertical-align: middle;// Normalizing for new icomoon symbols font } .btn-menu .invoke-menu, @@ -72,13 +72,16 @@ .menu .type-icon, .tree-item .type-icon, .super-menu.menu .type-icon { - font-size: $menuLineH * 0.8; //.93 - line-height: $menuLineH * 1.13; + //font-size: $menuLineH * 0.8; //.93 // Normalizing for new icomoon symbols font + //line-height: $menuLineH * 1.13; // Normalizing for new icomoon symbols font position: absolute; } - -.super-menu.menu.dropdown .icon { - font-size: $menuLineH * 0.95 +.tree-item .type-icon { + font-size: 16px; // 16px is crisp size +} + +.super-menu.menu.dropdown .icon { + //font-size: $menuLineH * 0.95 // Normalizing for new icomoon symbols font } diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 98ca1378e4..b2809e760a 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -30,9 +30,9 @@ $pad: $interiorMargin * $baseRatio; text-decoration: none; &.lg, &.create-btn { - $h: $ueTopBarH - $interiorMargin; + $h: $ueTopBarH; // - $interiorMargin; height: $h; - line-height: $h; + //line-height: $h; padding: 0 $pad * 3; } &.create-btn { @@ -40,7 +40,7 @@ $pad: $interiorMargin * $baseRatio; margin-left: $pad * -1; } >.ui-symbol { - font-size: 1.1em; + //font-size: 1.1em; // Normalizing for new icomoon symbols font } } &.sm { @@ -115,7 +115,7 @@ $pad: $interiorMargin * $baseRatio; &.labeled { padding: 0 $pad/2; .icon { - font-size: 1.5em; + //font-size: 1.5em; } .title-label { margin-left: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 83da982937..571c9f1146 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -186,8 +186,8 @@ .icon:not(.invoke-menu) { // position: relative; // top: -0.04em; - font-size: 150%; - vertical-align: middle; + //font-size: 150%; + //vertical-align: middle; } } @@ -361,7 +361,7 @@ label.checkbox.custom { color: lighten($colorBodyFg, 40%); } .type-icon { - font-size: 1.5em; + font-size: 120%; margin-right: $interiorMargin; vertical-align: middle; } diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss index 4ca7470fdc..f1adebce9a 100644 --- a/platform/commonUI/general/res/sass/helpers/_splitter.scss +++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss @@ -84,7 +84,7 @@ } .browse-area .splitter { - top: $ueTopBarH + $interiorMargin; + top: $ueTopBarH + $interiorMarginLg; } .edit-area .splitter { diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index 71f465a8dc..5a5cdaf9a3 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -27,23 +27,28 @@ } .item { &.grid-item { + //div { @include test() } $d: $ueBrowseGridItemLg; + $transTime: 200ms; @include btnSubtle($colorItemBase); box-sizing: border-box; cursor: pointer; float: left; height: $d; -// padding-bottom: 32%; width: $d; 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; } .item-open { - display: block; + //display: block; + opacity: 1; } } .contents { @@ -70,24 +75,26 @@ } .item-main { $h: $ueBrowseGridItemLg; - $lh: $h * 0.9; -// @include test(); - div { -// background: rgba(deeppink, 0.2); - } + $lh: $h * 0.8; + //top: $ueBrowseGridItemTopBarH; bottom: $ueBrowseGridItemBottomBarH; + line-height: $lh; z-index: 1; .item-type { color: $colorItemFg; text-align: center; - font-size: 7em; - line-height: $lh; + font-size: 6em; + //line-height: $lh; } .item-open { -// color: lighten($colorItemBase, 15%); - display: none; - font-size: 5em; - line-height: $lh; - left: auto; width: 30px; + //@include test(); + @include trans-prop-nice("opacity", $transTime); + opacity: 0; + //display: none; + font-size: 3em; + //line-height: $lh; + left: auto; width: 50px; + pointer-events: none; + text-align: right; } } .title { diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 344e5553ab..356bb8a527 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.80rem; + font-size: 0.80em; height: $menuLineH; line-height: $menuLineH; margin-bottom: $interiorMarginSm; @@ -38,7 +38,7 @@ ul.tree { .view-control { display: inline-block; margin-left: $interiorMargin; - // vertical-align: middle; + font-size: 0.75em; width: $treeVCW; $runningItemW: $interiorMargin + $treeVCW; &:hover { diff --git a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss b/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss index d6ddecff83..379626b5d2 100644 --- a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss +++ b/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss @@ -21,7 +21,7 @@ *****************************************************************************/ .ue-bottom-bar { color: lighten($colorBodyBg, 30%); - font-size: 0.7em; + font-size: 0.65rem; line-height: $ueFooterH - 4px; .status-holder { @include border-radius($basicCr * 1.75); @@ -52,9 +52,9 @@ @include box-shadow(inset rgba(black, 0.5) 0 0 3px); @include text-shadow(rgba(black, 0.3) 0 0 2px); display: inline-block; - font-size: 1.25em; - vertical-align: middle; - margin-right: $interiorMargin; + //font-size: 1.25em; // Normalized for new wtdsymbols font v2 + //vertical-align: middle; // Normalized for new wtdsymbols font v2 + margin-right: $interiorMarginSm; &.ok { color: #009900; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 8201597ca9..dd0c34654e 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -119,10 +119,8 @@ } .bottom-bar { + @include absPosDefault($bodyMargin); top: auto; - right: $bodyMargin; - bottom: $bodyMargin; - left: $bodyMargin; height: $ueFooterH; .status-holder { right: $ueAppLogoW + $bodyMargin; @@ -208,22 +206,18 @@ } .tree-holder { overflow: auto; - top: $ueTopBarH + $interiorMargin; + top: $ueTopBarH + $interiorMarginLg; } } &.items { .object-browse-bar { -// bottom: auto; .left.abs, .right.abs { top: auto; } - .right.abs { - bottom: $interiorMargin; - } } .object-holder { - top: $ueTopBarH + $interiorMargin; + top: $ueTopBarH + $interiorMarginLg; } } &.edit-main { diff --git a/platform/commonUI/general/res/sass/user-environ/_object-browse.scss b/platform/commonUI/general/res/sass/user-environ/_object-browse.scss index 3ebbebecf4..3ab3f8c5f7 100644 --- a/platform/commonUI/general/res/sass/user-environ/_object-browse.scss +++ b/platform/commonUI/general/res/sass/user-environ/_object-browse.scss @@ -21,7 +21,7 @@ *****************************************************************************/ .object-browse-bar { height: $ueTopBarH; - //line-height: $ueTopBarBtnH; + line-height: $ueTopBarH; .items-select { .btn-menu { margin-right: $interiorMargin * 3;