diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html index d27d088ee1..246a7b54b4 100644 --- a/platform/commonUI/browse/res/templates/items/grid-item.html +++ b/platform/commonUI/browse/res/templates/items/grid-item.html @@ -20,26 +20,21 @@ at runtime from the About dialog for additional information. --> -
-
+
+
-
- -
-
- -
P
-
+
O
+
{{type.getGlyph()}}
-
}
+
}
{{model.name}}
@@ -47,10 +42,10 @@ {{model.composition.length}} Items + + {{model.name}} +
-
- -
diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 7b9fa40b87..34a14c0107 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -433,7 +433,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../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%; @@ -442,10 +442,10 @@ input[type="text"] { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../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 620ed931bc..af2c481a59 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -185,7 +185,7 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../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%; @@ -194,15 +194,15 @@ background-image: -webkit-linear-gradient(#707070, #636363); background-image: linear-gradient(#707070, #636363); color: #bdbdbd; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover.btn-menu .invoke-menu { color: #949494; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../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; } + color: deepskyblue !important; } /* line 48, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type .l-icon-link { color: #49dedb; } @@ -211,35 +211,35 @@ opacity: 1; } /* line 57, ../sass/items/_item.scss */ .items-holder .item.grid-item .contents { - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; } - /* line 61, ../sass/items/_item.scss */ + top: 10px; + right: 10px; + bottom: 10px; + left: 10px; } + /* line 63, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs { bottom: auto; height: 20px; line-height: 20px; + text-align: right; z-index: 5; } - /* line 66, ../sass/items/_item.scss */ + /* line 69, ../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 68, ../sass/items/_item.scss */ + /* line 71, ../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: 3px; } - /* line 70, ../sass/items/_item.scss */ + /* line 73, ../sass/items/_item.scss */ .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 */ + /* line 79, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.bottom-bar.abs { top: auto; - height: 30px; - padding: 5px; } - /* line 82, ../sass/items/_item.scss */ + height: 30px; } + /* line 84, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main { line-height: 160px; z-index: 1; } - /* line 88, ../sass/items/_item.scss */ + /* line 90, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type { overflow: false; position: absolute; @@ -249,24 +249,23 @@ left: 40px; width: auto; height: auto; - color: #737373; text-align: center; font-size: 96.9px; line-height: 102px; bottom: auto; height: 102px; top: 30px; } - /* line 100, ../sass/items/_item.scss */ + /* line 102, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type .l-icon-link { - color: #1a8e8b; - height: 36px; - line-height: 36px; + color: #49dedb; + height: auto; + line-height: 100%; position: absolute; - font-size: 32px; + font-size: 0.3em; left: 0px; bottom: 10px; z-index: 2; } - /* line 112, ../sass/items/_item.scss */ + /* line 115, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-open { -moz-transition-property: "opacity"; -o-transition-property: "opacity"; @@ -286,13 +285,13 @@ width: 50px; pointer-events: none; text-align: right; } - /* line 124, ../sass/items/_item.scss */ + /* line 127, ../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; + text-overflow: ellipsis; white-space: nowrap; - text-overflow: ellipsis; } + color: #cccccc; } /* line 132, ../sass/items/_item.scss */ .items-holder .item.grid-item .details { font-size: 0.8em; } @@ -318,7 +317,7 @@ color: #999; display: inline-block; color: #80dfff; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../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%; @@ -327,10 +326,10 @@ background-image: -webkit-linear-gradient(#2ecbff, #14c4ff); background-image: linear-gradient(#2ecbff, #14c4ff); color: #bdbdbd; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover.btn-menu .invoke-menu { color: #75ddff; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected.btn-menu .invoke-menu { color: #52d4ff; } /* line 140, ../sass/items/_item.scss */ @@ -368,82 +367,82 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 34, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .mobile-grid-nav { - top: 0px; - bottom: 0px; - right: 55px; } - /* line 39, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .mobile-info { - text-align: center; - width: 50px; - right: 0px; - left: auto; - font-size: 1.3em; } - /* line 47, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar.abs { - top: 0px; - height: auto; } - /* line 54, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - font-size: 30px; - top: 0px; - left: 0px; - text-align: left; - height: auto; } - /* line 61, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - display: none; } - /* line 65, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .title, .items-holder .item.grid-item .details { - margin-left: 30px; } } + /* line 29, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item { + width: 100%; } + /* line 33, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item > .contents { + top: 0px; + right: 10px; + bottom: 0px; + left: 10px; } + /* line 37, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.top-bar { + bottom: 0 !important; + left: auto !important; + right: 20px !important; + width: 40px !important; + height: auto !important; + text-align: right; } + /* line 44, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.bottom-bar { + left: 40px; + right: 60px; } + /* line 52, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-type { + font-size: 30px; + right: auto; + bottom: auto; + left: 0; + line-height: 100%; + text-align: left; + width: 30px; } + /* line 61, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-type .l-icon-link { + bottom: 0; } + /* line 65, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-open { + display: block; + opacity: 1; + font-size: 1em; + width: auto; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { /* line 29, ../sass/mobile/_item.scss */ .items-holder .item.grid-item { - width: 100%; height: 50px; } - /* line 74, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .mobile-right { - top: 100%; } - /* line 77, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .mobile-info { - line-height: 25px; } - /* line 81, ../sass/mobile/_item.scss */ + /* line 78, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.top-bar { + line-height: 50px !important; } + /* line 82, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.bottom-bar { + top: 7px !important; + bottom: auto; + height: 35px; } + /* line 87, ../sass/mobile/_item.scss */ .items-holder .item.grid-item .item-main .item-type { - line-height: 40px; } - /* line 85, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .title { - margin-right: 10px; - line-height: 25px; } - /* line 89, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .details { - margin-right: 10px; - line-height: 0px; } } + top: 10px !important; + bottom: auto; + height: 30px; } + /* line 90, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-open { + line-height: 50px; } } @media screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { /* line 29, ../sass/mobile/_item.scss */ .items-holder .item.grid-item { - width: 100%; - height: 66.66667px; } - /* line 99, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .mobile-right { - top: 100%; } - /* line 103, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .mobile-info { - line-height: 38px; } - /* line 107, ../sass/mobile/_item.scss */ + height: 66px; } + /* line 100, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.top-bar { + line-height: 66px !important; } + /* line 104, ../sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.bottom-bar { + top: 15px !important; + bottom: auto; + height: 35px; } + /* line 109, ../sass/mobile/_item.scss */ .items-holder .item.grid-item .item-main .item-type { - font-size: 30px; - line-height: 50px; } + top: 18px !important; + bottom: auto; + height: 30px; } /* line 112, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .title { - margin-right: 10px; - line-height: 38px; } - /* line 116, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item .details { - margin-right: 10px; - line-height: 0px; } } -@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 29, ../sass/mobile/_item.scss */ - .items-holder .item.grid-item { - width: 200px; - height: 200px; } } + .items-holder .item.grid-item .item-main .item-open { + line-height: 66px; } } diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index c38a68b58f..c0444d9990 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1292,7 +1292,7 @@ mct-container { font-size: 1.65em; } /* line 48, ../sass/_icons.scss */ -.bar .icon { +.bar .ui-symbol { display: inline-block; } /* line 52, ../sass/_icons.scss */ @@ -1311,10 +1311,6 @@ mct-container { .super-menu.menu .type-icon { position: absolute; } -/* line 68, ../sass/_icons.scss */ -.tree-item .type-icon { - font-size: 16px; } - /* line 72, ../sass/_icons.scss */ .l-icon-link:before { content: "\f4"; } @@ -1769,7 +1765,7 @@ table { color: #999; display: inline-block; color: #ccf2ff; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../sass/_mixins.scss */ .btn.major:not(.disabled):hover, .s-btn.major:not(.disabled):hover, .major.icon-btn:not(.disabled):hover, @@ -1781,13 +1777,13 @@ table { background-image: -webkit-linear-gradient(#2ecbff, #14c4ff); background-image: linear-gradient(#2ecbff, #14c4ff); color: #bdbdbd; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../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 171, ../sass/_mixins.scss */ + /* line 175, ../sass/_mixins.scss */ .btn.major.btn-menu .invoke-menu, .s-btn.major.btn-menu .invoke-menu, .major.btn-menu.icon-btn .invoke-menu, @@ -1817,7 +1813,7 @@ table { border-top: 1px solid #2ecbff; color: #ccf2ff; display: inline-block; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../sass/_mixins.scss */ .btn.major:hover:not(.disabled):hover, .s-btn.major:hover:not(.disabled):hover, .major.icon-btn:hover:not(.disabled):hover, @@ -1829,13 +1825,13 @@ table { background-image: -webkit-linear-gradient(#47d1ff, #2ecbff); background-image: linear-gradient(#47d1ff, #2ecbff); color: white; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../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 171, ../sass/_mixins.scss */ + /* line 175, ../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, @@ -1871,7 +1867,7 @@ table { border-top: 1px solid #8a8a8a; color: #cccccc; display: inline-block; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../sass/_mixins.scss */ .btn.subtle:not(.disabled):hover, .s-btn.subtle:not(.disabled):hover, .subtle.icon-btn:not(.disabled):hover, @@ -1883,13 +1879,13 @@ table { background-image: -webkit-linear-gradient(#969696, #8a8a8a); background-image: linear-gradient(#969696, #8a8a8a); color: #f0f0f0; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../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 171, ../sass/_mixins.scss */ + /* line 175, ../sass/_mixins.scss */ .btn.subtle.btn-menu .invoke-menu, .s-btn.subtle.btn-menu .invoke-menu, .subtle.btn-menu.icon-btn .invoke-menu, @@ -1922,7 +1918,7 @@ table { border-top: 1px solid #575757; color: #999; display: inline-block; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../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, @@ -1937,7 +1933,7 @@ table { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../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, @@ -1946,7 +1942,7 @@ table { .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 171, ../sass/_mixins.scss */ + /* line 175, ../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, @@ -1982,7 +1978,7 @@ table { border-top: 1px solid #fe9510; color: #fff; display: inline-block; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../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, @@ -1997,7 +1993,7 @@ table { background-image: -webkit-linear-gradient(#fea029, #fe9510); background-image: linear-gradient(#fea029, #fe9510); color: white; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../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, @@ -2006,7 +2002,7 @@ table { .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 171, ../sass/_mixins.scss */ + /* line 175, ../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, @@ -2351,13 +2347,13 @@ label.checkbox.custom { padding-left: 19px; position: relative; vertical-align: top; } - /* line 205, ../sass/controls/_controls.scss */ + /* line 204, ../sass/controls/_controls.scss */ label.checkbox.custom em { color: #999; display: inline-block; height: 14px; min-width: 14px; } - /* line 210, ../sass/controls/_controls.scss */ + /* line 209, ../sass/controls/_controls.scss */ label.checkbox.custom em:before { -moz-border-radius: 1.5px; -webkit-border-radius: 1.5px; @@ -2376,51 +2372,51 @@ label.checkbox.custom { top: 0; position: absolute; text-align: center; } - /* line 228, ../sass/controls/_controls.scss */ + /* line 227, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text { overflow: hidden; margin-right: 0; padding-left: 0; height: 14px; width: 14px; } - /* line 234, ../sass/controls/_controls.scss */ + /* line 233, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text em { overflow: hidden; } - /* line 238, ../sass/controls/_controls.scss */ + /* line 237, ../sass/controls/_controls.scss */ label.checkbox.custom input { display: none; } - /* line 240, ../sass/controls/_controls.scss */ + /* line 239, ../sass/controls/_controls.scss */ label.checkbox.custom input:checked ~ em:before { background: #0099cc; color: #ccf2ff; content: "2"; } -/* line 248, ../sass/controls/_controls.scss */ +/* line 247, ../sass/controls/_controls.scss */ .input-labeled { margin-left: 5px; } - /* line 250, ../sass/controls/_controls.scss */ + /* line 249, ../sass/controls/_controls.scss */ .input-labeled label { display: inline-block; margin-right: 3px; } - /* line 254, ../sass/controls/_controls.scss */ + /* line 253, ../sass/controls/_controls.scss */ .input-labeled.inline { display: inline-block; } - /* line 257, ../sass/controls/_controls.scss */ + /* line 256, ../sass/controls/_controls.scss */ .input-labeled:first-child { margin-left: 0; } -/* line 262, ../sass/controls/_controls.scss */ +/* line 261, ../sass/controls/_controls.scss */ .btn-menu label.checkbox.custom { margin-left: 5px; } -/* line 267, ../sass/controls/_controls.scss */ +/* line 266, ../sass/controls/_controls.scss */ .item .checkbox.checked label { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; border-bottom: none; } -/* line 273, ../sass/controls/_controls.scss */ +/* line 272, ../sass/controls/_controls.scss */ .btn-menu { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2458,7 +2454,7 @@ label.checkbox.custom { color: lighten($c, 10%); } }*/ } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../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%; @@ -2467,37 +2463,37 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../sass/_mixins.scss */ .btn-menu.btn-menu .invoke-menu { color: #757575; } - /* line 285, ../sass/controls/_controls.scss */ + /* line 284, ../sass/controls/_controls.scss */ .btn-menu:not(.disabled):hover { color: #cccccc; } - /* line 310, ../sass/controls/_controls.scss */ + /* line 309, ../sass/controls/_controls.scss */ .btn-menu .name { margin-left: 5px; } - /* line 313, ../sass/controls/_controls.scss */ + /* line 312, ../sass/controls/_controls.scss */ .btn-menu .menu { position: absolute; left: 0; text-align: left; } - /* line 318, ../sass/controls/_controls.scss */ + /* line 317, ../sass/controls/_controls.scss */ .btn-menu .menu .ui-symbol.icon { width: 12px; } -/* line 324, ../sass/controls/_controls.scss */ +/* line 323, ../sass/controls/_controls.scss */ .top-bar .btn-menu { height: 25px; line-height: 25px; padding-right: 10px; } - /* line 332, ../sass/controls/_controls.scss */ + /* line 331, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn { margin-right: 5px; padding-left: 25px; } - /* line 335, ../sass/controls/_controls.scss */ + /* line 334, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn .badge { -moz-border-radius: 4.5px; -webkit-border-radius: 4.5px; @@ -2513,14 +2509,14 @@ label.checkbox.custom { width: 15px; height: auto; } -/* line 351, ../sass/controls/_controls.scss */ +/* line 350, ../sass/controls/_controls.scss */ .context-available { color: #0099cc; } - /* line 355, ../sass/controls/_controls.scss */ + /* line 354, ../sass/controls/_controls.scss */ .context-available:hover { color: deepskyblue; } -/* line 360, ../sass/controls/_controls.scss */ +/* line 359, ../sass/controls/_controls.scss */ .view-switcher { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; @@ -2536,37 +2532,37 @@ label.checkbox.custom { transition-timing-function: ease-in-out; } /******************************************************** OBJECT-HEADER */ -/* line 365, ../sass/controls/_controls.scss */ +/* line 364, ../sass/controls/_controls.scss */ .object-header { display: inline-block; font-size: 1em; } - /* line 369, ../sass/controls/_controls.scss */ + /* line 368, ../sass/controls/_controls.scss */ .object-header .label .title-label { color: white; } - /* line 372, ../sass/controls/_controls.scss */ + /* line 371, ../sass/controls/_controls.scss */ .object-header .label .type-icon { font-size: 120%; margin-right: 5px; vertical-align: middle; } - /* line 377, ../sass/controls/_controls.scss */ + /* line 376, ../sass/controls/_controls.scss */ .object-header .label .context-available { opacity: 0; font-size: 0.8em; } - /* line 382, ../sass/controls/_controls.scss */ + /* line 381, ../sass/controls/_controls.scss */ .object-header .label:hover .context-available { opacity: 1; } -/* line 391, ../sass/controls/_controls.scss */ +/* line 390, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { font-size: 1.1em; } - /* line 393, ../sass/controls/_controls.scss */ + /* line 392, ../sass/controls/_controls.scss */ .top-bar .object-header span, .object-browse-bar .object-header span { display: inline-block; } /******************************************************** SLIDERS */ -/* line 405, ../sass/controls/_controls.scss */ +/* line 404, ../sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2587,7 +2583,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 416, ../sass/controls/_controls.scss */ +/* line 415, ../sass/controls/_controls.scss */ .slider .knob { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2616,7 +2612,7 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../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%; @@ -2625,13 +2621,13 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../sass/_mixins.scss */ .slider .knob.btn-menu .invoke-menu { color: #757575; } - /* line 187, ../sass/_mixins.scss */ + /* line 191, ../sass/_mixins.scss */ .slider .knob:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -2655,7 +2651,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 209, ../sass/_mixins.scss */ + /* line 213, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -2670,12 +2666,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; border-color: #0099cc; } - /* line 427, ../sass/controls/_controls.scss */ + /* line 426, ../sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 434, ../sass/controls/_controls.scss */ +/* line 433, ../sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -2686,12 +2682,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 444, ../sass/controls/_controls.scss */ + /* line 443, ../sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ -/* line 452, ../sass/controls/_controls.scss */ +/* line 451, ../sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2708,7 +2704,7 @@ label.checkbox.custom { height: 10px; width: 10px; } -/* line 458, ../sass/controls/_controls.scss */ +/* line 457, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2726,7 +2722,7 @@ label.checkbox.custom { -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; border-top: 1px solid gray; } - /* line 465, ../sass/controls/_controls.scss */ + /* line 464, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzczNzM3MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2735,7 +2731,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#808080, #737373 20px); background-image: linear-gradient(#808080, #737373 20px); } -/* line 470, ../sass/controls/_controls.scss */ +/* line 469, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } @@ -2827,14 +2823,14 @@ label.checkbox.custom { padding: 3px 0; position: absolute; z-index: 10; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../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 309, ../sass/_mixins.scss */ + /* line 314, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2885,7 +2881,7 @@ label.checkbox.custom { border-top: 1px solid #919191; color: #999; display: inline-block; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../sass/_mixins.scss */ .menu-element .context-menu.btn-menu .invoke-menu, .menu-element .super-menu.btn-menu .invoke-menu { color: #b0b0b0; } @@ -3711,7 +3707,7 @@ input[type="text"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 275, ../sass/_mixins.scss */ + /* line 280, ../sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 29, ../sass/forms/_text-input.scss */ @@ -3765,7 +3761,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 163, ../sass/_mixins.scss */ + /* line 167, ../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%; @@ -3774,10 +3770,10 @@ input[type="text"] { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 166, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../sass/_mixins.scss */ .form-control.select.btn-menu .invoke-menu { color: #757575; } /* line 29, ../sass/forms/_selects.scss */ @@ -3856,7 +3852,7 @@ input[type="text"] { max-height: 400px; overflow: auto; padding: 5px; } - /* line 275, ../sass/_mixins.scss */ + /* line 280, ../sass/_mixins.scss */ .channel-selector .treeview.error { background: rgba(255, 0, 0, 0.5); } /* line 36, ../sass/forms/_channel-selector.scss */ @@ -3956,7 +3952,7 @@ input[type="text"] { padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 275, ../sass/_mixins.scss */ + /* line 280, ../sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -4394,7 +4390,7 @@ input[type="text"] { bottom: 15%; left: 15%; z-index: 101; } - /* line 171, ../sass/_mixins.scss */ + /* line 175, ../sass/_mixins.scss */ .overlay > .holder.btn-menu .invoke-menu { color: #757575; } /* line 45, ../sass/overlay/_overlay.scss */ @@ -4919,7 +4915,7 @@ input[type="text"] { right: 0; width: auto; height: 5px; } - /* line 187, ../sass/_mixins.scss */ + /* line 191, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4943,7 +4939,7 @@ input[type="text"] { top: 2px; left: 5px; right: 5px; } - /* line 209, ../sass/_mixins.scss */ + /* line 213, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4973,7 +4969,7 @@ input[type="text"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 187, ../sass/_mixins.scss */ + /* line 191, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4997,7 +4993,7 @@ input[type="text"] { left: 2px; bottom: 5px; top: 5px; } - /* line 209, ../sass/_mixins.scss */ + /* line 213, ../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 b80e1ff5f9..e6387a1cbe 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -152,7 +152,7 @@ ul.tree { margin: 0; padding: 0; } - /* line 309, ../sass/_mixins.scss */ + /* line 314, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -200,25 +200,23 @@ ul.tree { left: 15px; } /* line 60, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon { - overflow: false; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; text-shadow: rgba(0, 0, 0, 0.6) 0 1px 2px; + font-size: 16px; color: #0099cc; left: 5px; + position: absolute; + top: 4px !important; + bottom: auto; + height: 16px; + line-height: 100%; right: auto; - width: 1em; } - /* line 68, ../sass/tree/_tree.scss */ + width: 16px; } + /* line 73, ../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; position: absolute; z-index: 2; } - /* line 74, ../sass/tree/_tree.scss */ + /* line 79, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon .icon.l-icon-alert { color: #ff3c00; font-size: 8px; @@ -227,7 +225,7 @@ ul.tree { width: 8px; top: 1px; right: -2px; } - /* line 80, ../sass/tree/_tree.scss */ + /* line 85, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon .icon.l-icon-link { color: #49dedb; font-size: 8px; @@ -235,8 +233,8 @@ ul.tree { height: 8px; width: 8px; left: -3px; - bottom: 5px; } - /* line 89, ../sass/tree/_tree.scss */ + bottom: 0px; } + /* line 93, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .title-label { overflow: hidden; position: absolute; @@ -251,53 +249,53 @@ ul.tree { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 100, ../sass/tree/_tree.scss */ + /* line 104, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading { pointer-events: none; } - /* line 102, ../sass/tree/_tree.scss */ + /* line 106, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label { opacity: 0.5; } - /* line 104, ../sass/tree/_tree.scss */ + /* line 108, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label .title-label { font-style: italic; } - /* line 108, ../sass/tree/_tree.scss */ + /* line 112, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .wait-spinner { margin-left: 14px; } - /* line 113, ../sass/tree/_tree.scss */ + /* line 117, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected { background: #005177; color: #fff; } - /* line 117, ../sass/tree/_tree.scss */ + /* line 121, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .view-control { color: #0099cc; } - /* line 120, ../sass/tree/_tree.scss */ + /* line 124, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .label .type-icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 128, ../sass/tree/_tree.scss */ + /* line 132, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover { background: #404040; color: #cccccc; } - /* line 131, ../sass/tree/_tree.scss */ + /* line 135, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .context-trigger { display: block; } - /* line 134, ../sass/tree/_tree.scss */ + /* line 138, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .icon { color: #33ccff; } } - /* line 141, ../sass/tree/_tree.scss */ + /* line 145, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.loading) { cursor: pointer; } - /* line 145, ../sass/tree/_tree.scss */ + /* line 149, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger { top: -1px; position: absolute; right: 3px; } - /* line 151, ../sass/tree/_tree.scss */ + /* line 155, ../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 160, ../sass/tree/_tree.scss */ + /* line 164, ../sass/tree/_tree.scss */ ul.tree ul.tree { margin-left: 15px; } @@ -327,7 +325,7 @@ ul.tree { ul.tree { margin: 0; padding: 0; } - /* line 309, ../sass/_mixins.scss */ + /* line 314, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 2f4f938076..aaab92d345 100755 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 index d31a879fc3..a6f2bae8ea 100755 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -83,6 +83,8 @@ + + \ 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 index 37af03fa79..f6cf40ef12 100755 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 index c93e44215c..aaf58a7f76 100755 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 22518172da..aba4c8950d 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -147,6 +147,7 @@ $formLabelW: 20%; $formInputH: 22px; $formRowCtrlsH: 14px; $menuLineH: 1.5rem; +$menuLineHPx: 24px; $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 e37aaba143..9c71b49331 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -45,7 +45,7 @@ } } -.bar .icon { +.bar .ui-symbol { display: inline-block; } @@ -65,9 +65,9 @@ position: absolute; } -.tree-item .type-icon { - font-size: 16px; // 16px is crisp size -} +//.tree-item .type-icon { +// font-size: 16px; // 16px is crisp size +//} .l-icon-link:before { content: "\f4"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 4f2c1901af..c047c9582e 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -23,154 +23,158 @@ @mixin absPosDefault($offset: 0px, $overflowHidden: hidden) { overflow: $overflowHidden; position: absolute; - top: $offset; right: $offset; bottom: $offset; left: $offset; - width: auto; height: auto; + top: $offset; + right: $offset; + bottom: $offset; + left: $offset; + width: auto; + height: auto; } @mixin ancillaryIcon($d, $c) { - // Used for small icons used in combination with larger icons, - // like the link and alert icons in tree items. - color: $c; - font-size: $d; - line-height: $d; - height: $d; - width: $d; + // Used for small icons used in combination with larger icons, + // like the link and alert icons in tree items. + color: $c; + font-size: $d; + line-height: $d; + height: $d; + width: $d; } @mixin trans-prop-nice($props, $t: 500ms) { - @if $t == 0 { - @include transition-property(none); - } @else { - @include transition-property($props); - @include transition-duration($t); - @include transition-timing-function(ease-in-out); - } + @if $t == 0 { + @include transition-property(none); + } @else { + @include transition-property($props); + @include transition-duration($t); + @include transition-timing-function(ease-in-out); + } } @mixin trans-prop-nice-fade($t: 0.5s) { - @if $t == 0 { - @include transition-property(none); - } @else { - @include transition-property(visibility, opacity, background-color, border-color); - @include transition-duration($t); - @include transition-timing-function(ease-in-out); - } + @if $t == 0 { + @include transition-property(none); + } @else { + @include transition-property(visibility, opacity, background-color, border-color); + @include transition-duration($t); + @include transition-timing-function(ease-in-out); + } } @mixin trans-prop-nice-resize-h($t: 0.5s) { - @include transition-property(height, bottom, top); - @include transition-duration($t); - @include transition-timing-function(ease-in-out); + @include transition-property(height, bottom, top); + @include transition-duration($t); + @include transition-timing-function(ease-in-out); } @mixin trans-prop-nice-resize-w($t: 0.5s) { - @include transition-property(width, left, right); - @include transition-duration($t); - @include transition-timing-function(ease-in-out); + @include transition-property(width, left, right); + @include transition-duration($t); + @include transition-timing-function(ease-in-out); } @mixin triangle-right($size, $color) { - $size: $size/2; - $ratio: 1; - width: 0; - height: 0; - border-top: $size/$ratio solid transparent; - border-left: $size solid $color; - border-bottom: $size/$ratio solid transparent; + $size: $size/2; + $ratio: 1; + width: 0; + height: 0; + border-top: $size/$ratio solid transparent; + border-left: $size solid $color; + border-bottom: $size/$ratio solid transparent; } @mixin triangle-down($size, $color) { - $size: $size/2; - $ratio: 1; - width: 0; - height: 0; - border-left: $size/$ratio solid transparent; - border-top: $size solid $color; - border-right: $size/$ratio solid transparent; + $size: $size/2; + $ratio: 1; + width: 0; + height: 0; + border-left: $size/$ratio solid transparent; + border-top: $size solid $color; + border-right: $size/$ratio solid transparent; } @mixin triangle($dir: "left", $size: 5px, $ratio: 1, $color: red) { - //$size: $size*2; - width: 0; - height: 0; - $slopedB: $size/$ratio solid transparent; - $straightB: $size solid $color; - @if $dir == "up" { - border-left: $slopedB; - border-right: $slopedB; - border-bottom: $straightB; - } @else if $dir == "right" { - border-top: $slopedB; - border-bottom: $slopedB; - border-left: $straightB; - } @else if $dir == "down" { - border-left: $slopedB; - border-right: $slopedB; - border-top: $straightB; - } @else { - border-top: $slopedB; - border-bottom: $slopedB; - border-right: $straightB; - } + //$size: $size*2; + width: 0; + height: 0; + $slopedB: $size/$ratio solid transparent; + $straightB: $size solid $color; + @if $dir == "up" { + border-left: $slopedB; + border-right: $slopedB; + border-bottom: $straightB; + } @else if $dir == "right" { + border-top: $slopedB; + border-bottom: $slopedB; + border-left: $straightB; + } @else if $dir == "down" { + border-left: $slopedB; + border-right: $slopedB; + border-top: $straightB; + } @else { + border-top: $slopedB; + border-bottom: $slopedB; + border-right: $straightB; + } } @mixin bgDiagonalStripes($c: yellow, $a: 0.1, $d: 40px) { - @include background-image(linear-gradient(-45deg, - rgba($c, $a) 25%, transparent 25%, - transparent 50%, rgba($c, $a) 50%, - rgba($c, $a) 75%, transparent 75%, - transparent 100% - )); - background-repeat: repeat; - background-size: $d $d; + @include background-image(linear-gradient(-45deg, + rgba($c, $a) 25%, transparent 25%, + transparent 50%, rgba($c, $a) 50%, + rgba($c, $a) 75%, transparent 75%, + transparent 100% + )); + background-repeat: repeat; + background-size: $d $d; } @mixin bgTicks($c: $colorBodyFg, $repeatDir: 'x') { - $deg: 90deg; - @if ($repeatDir != 'x') { - $deg: 0deg; - $repeatDir: repeat-y; - } @else { - $repeatDir: repeat-x; - } + $deg: 90deg; + @if ($repeatDir != 'x') { + $deg: 0deg; + $repeatDir: repeat-y; + } @else { + $repeatDir: repeat-x; + } - @include background-image(linear-gradient($deg, - $c 1px, transparent 1px, - transparent 100% - )); - background-repeat: $repeatDir; + @include background-image(linear-gradient($deg, + $c 1px, transparent 1px, + transparent 100% + )); + background-repeat: $repeatDir; } @mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { - $ltnRatio: 7%; - $gradRatio: 5%; - $hovRatio: 7%; - $bgBase: lighten($bg, $ltnRatio); - $fgBase: lighten($fg, $ltnRatio); - $gradC1: lighten($bgBase, $gradRatio); - $gradC2: $bgBase; - $cInvokeBase: lighten($gradC1, $ltnRatio*2); + $ltnRatio: 7%; + $gradRatio: 5%; + $hovRatio: 7%; + $bgBase: lighten($bg, $ltnRatio); + $fgBase: lighten($fg, $ltnRatio); + $gradC1: lighten($bgBase, $gradRatio); + $gradC2: $bgBase; + $cInvokeBase: lighten($gradC1, $ltnRatio*2); - @include background-image(linear-gradient($gradC1, $gradC2)); - @include border-radius($controlCr); - @include box-sizing(border-box); - @include boxShdwSubtle(); - border: none; - border-top: 1px solid lighten($gradC1, 2%); - color: $fg; - display: inline-block; - @if $hover == true { - &:not(.disabled):hover { - @include background-image(linear-gradient(lighten($gradC1, $hovRatio), lighten($gradC2, $hovRatio))); - color: lighten($fgBase, $hovRatio); - &.btn-menu .invoke-menu { - color: lighten($cInvokeBase, $hovRatio); - } - } - } - &.btn-menu .invoke-menu { - color: $cInvokeBase; - } + @include background-image(linear-gradient($gradC1, $gradC2)); + @include border-radius($controlCr); + @include box-sizing(border-box); + @include boxShdwSubtle(); + border: none; + border-top: 1px solid lighten($gradC1, 2%); + color: $fg; + display: inline-block; + @if $hover == true { + &:not(.disabled):hover { + @include background-image(linear-gradient(lighten($gradC1, $hovRatio), lighten($gradC2, $hovRatio))); + color: lighten($fgBase, $hovRatio); + &.btn-menu .invoke-menu { + color: lighten($cInvokeBase, $hovRatio); + } + } + } + &.btn-menu .invoke-menu { + color: $cInvokeBase; + } } @mixin sliderTrack($bg: $scrollbarTrackColorBg) { @@ -184,45 +188,45 @@ } @mixin controlGrippy($b, $direction: horizontal, $w: 1px, $style: dotted) { - &:before { - @include trans-prop-nice("border-color",0.75s); - content: ''; - display: block; - height: auto; - pointer-events: none; - position: absolute; - z-index: 2; + &:before { + @include trans-prop-nice("border-color", 0.75s); + content: ''; + display: block; + height: auto; + pointer-events: none; + position: absolute; + z-index: 2; - @if $direction == "horizontal" { - border-top: $w $style darken($b, 15%); - top: 2px; - left: 5px; - right: 5px; + @if $direction == "horizontal" { + border-top: $w $style darken($b, 15%); + top: 2px; + left: 5px; + right: 5px; - } @else if $direction == "vertical" { - border-left: $w $style darken($b, 15%); - left: 2px; - bottom: 5px; - top: 5px; - } - } - &:not(.disabled):hover:before { - @include trans-prop-nice("border-color",50ms); - border-color: $colorKey; - } + } @else if $direction == "vertical" { + border-left: $w $style darken($b, 15%); + left: 2px; + bottom: 5px; + top: 5px; + } + } + &:not(.disabled):hover:before { + @include trans-prop-nice("border-color", 50ms); + border-color: $colorKey; + } } @mixin btnSubtle($bg: $colorBodyBg, $fg: $colorBodyFg) { - @include containerSubtle($bg, $fg, true); + @include containerSubtle($bg, $fg, true); } @mixin btnNoticeable($bg: $colorBodyBg, $fg: $colorBodyFg) { - // No longer should be used; use btnSubtle instead - //@include containerSubtle($bg, $fg, true); - //@include background-image(linear-gradient(lighten($bg, 20%), $bg)); -/* &:not(.disabled):hover { - @include background-image(linear-gradient(lighten($bg, 30%), lighten($bg, 10%))); - }*/ + // No longer should be used; use btnSubtle instead + //@include containerSubtle($bg, $fg, true); + //@include background-image(linear-gradient(lighten($bg, 20%), $bg)); + /* &:not(.disabled):hover { + @include background-image(linear-gradient(lighten($bg, 30%), lighten($bg, 10%))); + }*/ } @mixin boxIncised($sVal: 0.6) { @@ -238,59 +242,60 @@ } @mixin boxShdwLarge($sVal: 0.7) { - @include box-shadow(rgba(black, $sVal) 0 3px 10px); + @include box-shadow(rgba(black, $sVal) 0 3px 10px); } @mixin outerGlow($color: #fff, $sVal: 0.3) { - @include box-shadow(rgba($color, $sVal) 0 0 30px); + @include box-shadow(rgba($color, $sVal) 0 0 30px); } @mixin linearGlow($deg: 0, $c: red, $a: 0.4) { - @include background-image(linear-gradient($deg, rgba($c,0), rgba($c, $a) 100%)); + @include background-image(linear-gradient($deg, rgba($c, 0), rgba($c, $a) 100%)); } @mixin subtleGrad($deg: 0, $c: red, $a0: 0.2, $a1: 0.3) { - @include background-image(linear-gradient($deg, rgba($c,$a0), rgba($c, $a1) 100%)); + @include background-image(linear-gradient($deg, rgba($c, $a0), rgba($c, $a1) 100%)); } @mixin txtShdwSubtle($sVal: 0.1) { - @include text-shadow(rgba(black, $sVal) 0 1px 2px); + @include text-shadow(rgba(black, $sVal) 0 1px 2px); } + @mixin txtShdwLarge($sVal: 0.7) { - @include text-shadow(rgba(black, $sVal) 0 3px 7px); + @include text-shadow(rgba(black, $sVal) 0 3px 7px); } /*********************************************** FORM ELEMENTS */ @mixin input-base($bg: $colorBodyBg, $fg: $colorBodyFg) { - @include appearance(none); - @include border-radius($controlCr); - @include box-sizing(border-box); - @include box-shadow(inset rgba(black, 0.65) 0 1px 4px); - // background: lighten($bg, 20%); - background: rgba(#fff, 0.1); - border: none; - //border-bottom: 1px solid rgba(#fff, 0.1); - color: lighten($fg, 20%); - outline: none; - &.error { - background: rgba(red, 0.5); - } + @include appearance(none); + @include border-radius($controlCr); + @include box-sizing(border-box); + @include box-shadow(inset rgba(black, 0.65) 0 1px 4px); + // background: lighten($bg, 20%); + background: rgba(#fff, 0.1); + border: none; + //border-bottom: 1px solid rgba(#fff, 0.1); + color: lighten($fg, 20%); + outline: none; + &.error { + background: rgba(red, 0.5); + } } @mixin nice-input($bg: $colorBodyBg, $fg: $colorBodyFg) { - @include input-base($bg, $fg); - padding: 0 $interiorMarginSm; + @include input-base($bg, $fg); + padding: 0 $interiorMarginSm; } @mixin nice-textarea($bg: $colorBodyBg, $fg: $colorBodyFg) { - @include input-base($bg, $fg); - padding: $interiorMargin; + @include input-base($bg, $fg); + padding: $interiorMargin; } @mixin subdued-input($bg: $colorBodyBg, $fg: $colorBodyFg) { - @include nice-input($bg, $fg); - background: lighten($bg, 3%); - border-bottom: 1px solid lighten($bg, 10%); + @include nice-input($bg, $fg); + background: lighten($bg, 3%); + border-bottom: 1px solid lighten($bg, 10%); } /* @@ -308,24 +313,30 @@ padding: 0; li { list-style-type: none; - margin:0; + margin: 0; padding: 0; } } -@mixin vertical-align { - /* This doesn't work on an element inside an element with absolute positioning that has height: auto */ - position: relative; - top: 50%; - -webkit-transform: translateY(-50%); - -ms-transform: translateY(-50%); - transform: translateY(-50%); +@mixin verticalCenter { + /* This doesn't work on an element inside an element with absolute positioning that has height: auto */ + //position: relative; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); +} + +@mixin verticalCenterBlock($holderH, $itemH) { + top: floor(($holderH - $itemH) / 2) !important; + bottom: auto; + height: $itemH; } @mixin ellipsize() { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } @mixin scrollH($showBar: auto) { @@ -339,21 +350,21 @@ } @mixin wait-spinner($b: 5px, $c: $colorAlt1) { - display: block; - position: absolute; - -webkit-animation: rotation .6s infinite linear; - -moz-animation: rotation .6s infinite linear; - -o-animation: rotation .6s infinite linear; - animation: rotation .6s infinite linear; - border-color: rgba($c, 0.25); - border-top-color: rgba($c, 1.0); - border-style: solid; - border-width: $b; - border-radius: 100%; + display: block; + position: absolute; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; + border-color: rgba($c, 0.25); + border-top-color: rgba($c, 1.0); + border-style: solid; + border-width: $b; + border-radius: 100%; } @mixin test($c: #ffcc00, $a: 0.2) { - background-color: rgba($c, $a); + background-color: rgba($c, $a); } @mixin testObj($w: 2000px, $h: 1000px, $c: black, $a: 0.1) { @@ -374,6 +385,6 @@ } @mixin s-stale($a: 0.5) { - color: rgba($colorTelemFresh, $a) !important; - font-style: italic; + color: rgba($colorTelemFresh, $a) !important; + font-style: italic; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 3f15a69491..ce91bbe16d 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -194,7 +194,6 @@ label.checkbox.custom { $bg: lighten($colorBodyBg, $ltGamma); $d: $formRowCtrlsH; - // @include vertical-align(); cursor: pointer; display: inline-block; line-height: $d; diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index 86592f77de..836f5d754c 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -44,7 +44,7 @@ position: relative; &:hover .item-main { .item-type { - color: $colorKey !important; + color: lighten($colorKey, 10%) !important; .l-icon-link { color: $colorIconLink; } @@ -55,13 +55,16 @@ } } .contents { - top: $interiorMargin; right: $interiorMargin; bottom: $interiorMargin; left: $interiorMargin; + //@include test(red); + $m: $interiorMarginLg; + top: $m; right: $m; bottom: $m; left: $m; } .bar { &.top-bar.abs { bottom: auto; height: $ueBrowseGridItemTopBarH; line-height: $ueBrowseGridItemTopBarH; + text-align: right; z-index: 5; .left, .right { width: auto; @@ -76,7 +79,6 @@ &.bottom-bar.abs { top: auto; height: $ueBrowseGridItemBottomBarH; - padding: $interiorMargin; } } .item-main { @@ -89,7 +91,7 @@ //@include trans-prop-nice("color", $transTime); @include absPosDefault($iconMargin, false); //@include test(red); - color: $colorItemFg; + //color: $colorItemFg; text-align: center; font-size: $iconD * 0.95; //6em; line-height: $iconD; @@ -99,11 +101,12 @@ //line-height: $lh; .l-icon-link { // When the link icon is in the item-type icon holder - color: darken($colorIconLink, 25%); - height: 36px; - line-height: 36px; + //color: darken($colorIconLink, 25%); + color: $colorIconLink; + height: auto; + line-height: 100%; position: absolute; - font-size: 32px; + font-size: 0.3em; left: 0px; bottom: 10px; z-index: 2; @@ -123,11 +126,8 @@ } .title { @include txtShdwSubtle(); + @include ellipsize(); color: lighten($colorBodyFg, 20%); - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -// font-weight: bold; } .details { font-size: 0.8em; diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index def2526c61..168daad4bf 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -58,11 +58,16 @@ ul.tree { left: $runningItemW; .type-icon { - @include absPosDefault(0, false); + //@include absPosDefault(0, false); + $d: 16px; // 16px is crisp size @include txtShdwSubtle(0.6); + font-size: $d; color: $colorItemTreeIcon; left: $interiorMargin; - right: auto; width: 1em; + position: absolute; + @include verticalCenterBlock($menuLineHPx, $d); + line-height: 100%; + right: auto; width: $d; .icon { &.l-icon-link, @@ -81,8 +86,7 @@ ul.tree { $d: 8px; @include ancillaryIcon($d, $colorIconLink); left: -3px; - bottom: 5px; - + bottom: 0px; } } }