diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 96de3a91ec..f0b54ca246 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -175,7 +175,7 @@ input[type="text"] { position: relative; overflow: hidden; vertical-align: middle; } - /* line 82, ../sass/_mixins.scss */ + /* line 115, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); background-image: -webkit-linear-gradient(#666666, #4d4d4d); diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 1ffb4b4d63..c666e17e78 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -35,7 +35,7 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 82, ../sass/_mixins.scss */ + /* line 115, ../sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #737373), color-stop(100%, #595959)); background-image: -webkit-linear-gradient(#737373, #595959); @@ -118,7 +118,7 @@ background-image: -o-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #80dfff; } - /* line 90, ../sass/_mixins.scss */ + /* line 123, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #66d9ff), color-stop(100%, #00bfff)); background-image: -webkit-linear-gradient(#66d9ff, #00bfff); diff --git a/platform/commonUI/general/res/css/plots.css b/platform/commonUI/general/res/css/plots.css index 605345b283..62cf0bca2a 100644 --- a/platform/commonUI/general/res/css/plots.css +++ b/platform/commonUI/general/res/css/plots.css @@ -55,20 +55,25 @@ left: 60px; cursor: crosshair; border: 1px solid #4d4d4d; } - /* line 65, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label { + /* line 66, ../sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label, + .gl-plot .l-plot-label { color: #cccccc; position: absolute; text-align: center; } - /* line 72, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label.gl-plot-x-label { + /* line 74, ../sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label, + .gl-plot .l-plot-label.gl-plot-x-label, + .gl-plot .l-plot-label.l-plot-x-label { top: auto; right: 0; bottom: 0; left: 0; height: auto; } - /* line 80, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label.gl-plot-y-label { + /* line 83, ../sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label, + .gl-plot .l-plot-label.gl-plot-y-label, + .gl-plot .l-plot-label.l-plot-y-label { -webkit-transform-origin: 50% 0; -moz-transform-origin: 50% 0; -ms-transform-origin: 50% 0; @@ -84,7 +89,7 @@ left: 0; top: 50%; white-space: nowrap; } - /* line 93, ../sass/plots/_plots-main.scss */ + /* line 96, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-y-options { position: absolute; top: 50%; @@ -95,19 +100,19 @@ height: auto; min-height: 32px; width: 32px; } - /* line 107, ../sass/plots/_plots-main.scss */ + /* line 110, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash { position: absolute; border: 0 rgba(255, 255, 255, 0.3) dashed; } - /* line 110, ../sass/plots/_plots-main.scss */ + /* line 113, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-v { border-right-width: 1px; height: 100%; } - /* line 114, ../sass/plots/_plots-main.scss */ + /* line 117, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-h { border-bottom-width: 1px; width: 100%; } - /* line 120, ../sass/plots/_plots-main.scss */ + /* line 123, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-legend { position: absolute; top: 0; @@ -118,20 +123,20 @@ overflow-x: hidden; overflow-y: auto; } -/* line 148, ../sass/plots/_plots-main.scss */ +/* line 151, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item, .gl-plot-legend .legend-item, .legend .plot-legend-item, .legend .legend-item { display: inline-block; margin-right: 10px; } - /* line 151, ../sass/plots/_plots-main.scss */ + /* line 154, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item span, .gl-plot-legend .legend-item span, .legend .plot-legend-item span, .legend .legend-item span { vertical-align: middle; } - /* line 155, ../sass/plots/_plots-main.scss */ + /* line 158, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch, .gl-plot-legend .plot-legend-item .color-swatch, .gl-plot-legend .legend-item .plot-color-swatch, @@ -150,16 +155,16 @@ width: 8px; margin-right: 3px; } -/* line 169, ../sass/plots/_plots-main.scss */ +/* line 172, ../sass/plots/_plots-main.scss */ .tick { position: absolute; border: 0 rgba(255, 255, 255, 0.3) solid; } - /* line 172, ../sass/plots/_plots-main.scss */ + /* line 175, ../sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; height: 100%; } -/* line 180, ../sass/plots/_plots-main.scss */ +/* line 183, ../sass/plots/_plots-main.scss */ .gl-plot-tick, .tick-label { font-size: 0.7rem; @@ -167,7 +172,7 @@ overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 188, ../sass/plots/_plots-main.scss */ + /* line 191, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x, .tick-label.gl-plot-x-tick-label, .tick-label.tick-label-x { @@ -178,7 +183,7 @@ width: 20%; margin-left: -10%; text-align: center; } - /* line 198, ../sass/plots/_plots-main.scss */ + /* line 201, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y, .tick-label.gl-plot-y-tick-label, .tick-label.tick-label-y { @@ -188,18 +193,18 @@ margin-bottom: -0.5em; text-align: right; } -/* line 209, ../sass/plots/_plots-main.scss */ +/* line 212, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label { top: 5px; } -/* line 212, ../sass/plots/_plots-main.scss */ +/* line 215, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label { right: 5px; left: 5px; } -/* line 219, ../sass/plots/_plots-main.scss */ +/* line 222, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-x { top: 0; } -/* line 222, ../sass/plots/_plots-main.scss */ +/* line 225, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-y { right: 0; left: 0; } diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 2c4aa2f49f..315bc41978 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -75,29 +75,28 @@ a.disabled { border: 1px solid #666666; } /* line 17, ../sass/_effects.scss */ +.test-stripes { + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, transparent 75%, transparent 0%); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, transparent 75%, transparent 0%); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, transparent 75%, transparent 0%); + background-image: linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, transparent 75%, transparent 0%); + background-repeat: repeat; + background-size: 40px 40px; } + +/* line 21, ../sass/_effects.scss */ .test { background-color: rgba(255, 204, 0, 0.2); } -@font-face { - /* - * Use https://www.web-font-generator.com/ to gen fonts - */ - font-family: 'symbolsfont'; - src: url("../fonts/symbols/wtdsymbols.eot"); - src: url("../fonts/symbols/wtdsymbols.eot?#iefix") format("embedded-opentype"), url("../fonts/symbols/wtdsymbols.woff") format("woff"), url("../fonts/symbols/wtdsymbols.woff2") format("woff2"), url("../fonts/symbols/wtdsymbols.ttf") format("truetype"), url("../fonts/symbols/wtdsymbols.svg#armataregular") format("svg"); - font-weight: normal; - font-style: normal; } - -/* line 16, ../sass/_global.scss */ +/* line 1, ../sass/_global.scss */ a { color: #ccc; cursor: pointer; text-decoration: none; } - /* line 20, ../sass/_global.scss */ + /* line 5, ../sass/_global.scss */ a:hover { color: #fff; } -/* line 25, ../sass/_global.scss */ +/* line 10, ../sass/_global.scss */ body, html { background-color: #333333; color: #999999; @@ -107,20 +106,20 @@ body, html { width: 100%; overflow: hidden; } -/* line 35, ../sass/_global.scss */ +/* line 20, ../sass/_global.scss */ em { color: rgba(255, 255, 255, 0.2); font-style: normal; } -/* line 40, ../sass/_global.scss */ +/* line 25, ../sass/_global.scss */ input, textarea { font-family: Helvetica, Arial, sans-serif; } -/* line 44, ../sass/_global.scss */ +/* line 29, ../sass/_global.scss */ h1, h2, h3 { margin: 0; } -/* line 48, ../sass/_global.scss */ +/* line 33, ../sass/_global.scss */ h1 { font-size: 1.7em; font-weight: normal !important; @@ -128,17 +127,17 @@ h1 { margin-bottom: 20px; margin-top: 0; } -/* line 56, ../sass/_global.scss */ +/* line 41, ../sass/_global.scss */ p { margin-bottom: 10px; } -/* line 60, ../sass/_global.scss */ +/* line 45, ../sass/_global.scss */ span { /* 618 DEBUG box-sizing: border-box; */ } -/* line 66, ../sass/_global.scss */ +/* line 51, ../sass/_global.scss */ .abs { position: absolute; top: 0; @@ -148,37 +147,51 @@ span { height: auto; width: auto; } -/* line 76, ../sass/_global.scss */ +/* line 61, ../sass/_global.scss */ .code { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 83, ../sass/_global.scss */ +/* line 68, ../sass/_global.scss */ +.align-right { + text-align: right; } + +/* line 72, ../sass/_global.scss */ .centered { text-align: center; } -/* line 87, ../sass/_global.scss */ +/* line 76, ../sass/_global.scss */ .colorKey { color: #0099cc; } -/* line 91, ../sass/_global.scss */ +/* line 80, ../sass/_global.scss */ .ds { -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; } -/* line 96, ../sass/_global.scss */ +/* line 85, ../sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 100, ../sass/_global.scss */ +/* line 89, ../sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } -/* line 1, ../sass/_fonts.scss */ +@font-face { + /* + * Use https://www.web-font-generator.com/ to gen fonts + */ + font-family: 'symbolsfont'; + src: url("../fonts/symbols/wtdsymbols.eot"); + src: url("../fonts/symbols/wtdsymbols.eot?#iefix") format("embedded-opentype"), url("../fonts/symbols/wtdsymbols.woff") format("woff"), url("../fonts/symbols/wtdsymbols.ttf") format("truetype"), url("../fonts/symbols/wtdsymbols.svg#armataregular") format("svg"); + font-weight: normal; + font-style: normal; } + +/* line 15, ../sass/_fonts.scss */ .ui-symbol { font-family: 'symbolsfont'; } @@ -487,7 +500,7 @@ span { display: inline-block; font-size: 1rem; vertical-align: middle; } - /* line 126, ../sass/_mixins.scss */ + /* line 159, ../sass/_mixins.scss */ .invoke-menu:hover { color: #33ccff; } @@ -499,7 +512,7 @@ span { /* line 49, ../sass/_icons.scss */ .icon-buttons-main .invoke-menu { color: #666666; } - /* line 126, ../sass/_mixins.scss */ + /* line 159, ../sass/_mixins.scss */ .icon-buttons-main .invoke-menu:hover { color: #999999; } @@ -642,7 +655,7 @@ span { border-top: 1px solid #666666; color: #999999; display: inline-block; } - /* line 37, ../sass/_mixins.scss */ + /* line 70, ../sass/_mixins.scss */ .s-btn.s-very-subtle:hover, .s-very-subtle.s-icon-btn:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #595959)); background-image: -webkit-linear-gradient(#666666, #595959); @@ -811,7 +824,7 @@ a.l-btn span { background-image: -o-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #ccf2ff; } - /* line 90, ../sass/_mixins.scss */ + /* line 123, ../sass/_mixins.scss */ .btn.major:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #66d9ff), color-stop(100%, #00bfff)); background-image: -webkit-linear-gradient(#66d9ff, #00bfff); @@ -845,7 +858,7 @@ a.l-btn span { background-image: -o-linear-gradient(#4dd2ff, #00ace6); background-image: linear-gradient(#4dd2ff, #00ace6); color: #ccf2ff; } - /* line 90, ../sass/_mixins.scss */ + /* line 123, ../sass/_mixins.scss */ .btn.major:hover:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80dfff), color-stop(100%, #1ac6ff)); background-image: -webkit-linear-gradient(#80dfff, #1ac6ff); @@ -882,7 +895,7 @@ a.l-btn span { border-top: 1px solid #999999; color: #cccccc; display: inline-block; } - /* line 82, ../sass/_mixins.scss */ + /* line 115, ../sass/_mixins.scss */ .btn.subtle:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #999999), color-stop(100%, #808080)); background-image: -webkit-linear-gradient(#999999, #808080); @@ -910,7 +923,7 @@ a.l-btn span { border-top: 1px solid #666666; color: #b3b3b3; display: inline-block; } - /* line 82, ../sass/_mixins.scss */ + /* line 115, ../sass/_mixins.scss */ .btn.very-subtle:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); background-image: -webkit-linear-gradient(#666666, #4d4d4d); @@ -1110,7 +1123,7 @@ label.checkbox.custom { display: inline-block; height: 20px; line-height: 20px; } - /* line 82, ../sass/_mixins.scss */ + /* line 115, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); background-image: -webkit-linear-gradient(#666666, #4d4d4d); @@ -1267,14 +1280,14 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 82, ../sass/_mixins.scss */ + /* line 115, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: -moz-linear-gradient(#666666, #4d4d4d); background-image: -o-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 54, ../sass/_mixins.scss */ + /* line 87, ../sass/_mixins.scss */ .slider .knob:before { content: ''; display: block; @@ -1285,7 +1298,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 75, ../sass/_mixins.scss */ + /* line 108, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } /* line 426, ../sass/controls/_controls.scss */ @@ -1407,7 +1420,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 134, ../sass/_mixins.scss */ + /* line 167, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -1749,7 +1762,7 @@ input[type="text"] { position: relative; overflow: hidden; vertical-align: middle; } - /* line 82, ../sass/_mixins.scss */ + /* line 115, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); background-image: -webkit-linear-gradient(#666666, #4d4d4d); @@ -2018,20 +2031,25 @@ input[type="text"] { left: 60px; cursor: crosshair; border: 1px solid #4d4d4d; } - /* line 65, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label { + /* line 66, ../sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label, + .gl-plot .l-plot-label { color: #cccccc; position: absolute; text-align: center; } - /* line 72, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label.gl-plot-x-label { + /* line 74, ../sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label, + .gl-plot .l-plot-label.gl-plot-x-label, + .gl-plot .l-plot-label.l-plot-x-label { top: auto; right: 0; bottom: 0; left: 0; height: auto; } - /* line 80, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label.gl-plot-y-label { + /* line 83, ../sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label, + .gl-plot .l-plot-label.gl-plot-y-label, + .gl-plot .l-plot-label.l-plot-y-label { -webkit-transform-origin: 50% 0; -moz-transform-origin: 50% 0; -ms-transform-origin: 50% 0; @@ -2047,7 +2065,7 @@ input[type="text"] { left: 0; top: 50%; white-space: nowrap; } - /* line 93, ../sass/plots/_plots-main.scss */ + /* line 96, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-y-options { position: absolute; top: 50%; @@ -2058,19 +2076,19 @@ input[type="text"] { height: auto; min-height: 32px; width: 32px; } - /* line 107, ../sass/plots/_plots-main.scss */ + /* line 110, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash { position: absolute; border: 0 rgba(255, 255, 255, 0.3) dashed; } - /* line 110, ../sass/plots/_plots-main.scss */ + /* line 113, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-v { border-right-width: 1px; height: 100%; } - /* line 114, ../sass/plots/_plots-main.scss */ + /* line 117, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-h { border-bottom-width: 1px; width: 100%; } - /* line 120, ../sass/plots/_plots-main.scss */ + /* line 123, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-legend { position: absolute; top: 0; @@ -2081,20 +2099,20 @@ input[type="text"] { overflow-x: hidden; overflow-y: auto; } -/* line 148, ../sass/plots/_plots-main.scss */ +/* line 151, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item, .gl-plot-legend .legend-item, .legend .plot-legend-item, .legend .legend-item { display: inline-block; margin-right: 10px; } - /* line 151, ../sass/plots/_plots-main.scss */ + /* line 154, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item span, .gl-plot-legend .legend-item span, .legend .plot-legend-item span, .legend .legend-item span { vertical-align: middle; } - /* line 155, ../sass/plots/_plots-main.scss */ + /* line 158, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch, .gl-plot-legend .plot-legend-item .color-swatch, .gl-plot-legend .legend-item .plot-color-swatch, @@ -2113,16 +2131,16 @@ input[type="text"] { width: 8px; margin-right: 3px; } -/* line 169, ../sass/plots/_plots-main.scss */ +/* line 172, ../sass/plots/_plots-main.scss */ .tick { position: absolute; border: 0 rgba(255, 255, 255, 0.3) solid; } - /* line 172, ../sass/plots/_plots-main.scss */ + /* line 175, ../sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; height: 100%; } -/* line 180, ../sass/plots/_plots-main.scss */ +/* line 183, ../sass/plots/_plots-main.scss */ .gl-plot-tick, .tick-label { font-size: 0.7rem; @@ -2130,7 +2148,7 @@ input[type="text"] { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 188, ../sass/plots/_plots-main.scss */ + /* line 191, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x, .tick-label.gl-plot-x-tick-label, .tick-label.tick-label-x { @@ -2141,7 +2159,7 @@ input[type="text"] { width: 20%; margin-left: -10%; text-align: center; } - /* line 198, ../sass/plots/_plots-main.scss */ + /* line 201, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y, .tick-label.gl-plot-y-tick-label, .tick-label.tick-label-y { @@ -2151,18 +2169,18 @@ input[type="text"] { margin-bottom: -0.5em; text-align: right; } -/* line 209, ../sass/plots/_plots-main.scss */ +/* line 212, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label { top: 5px; } -/* line 212, ../sass/plots/_plots-main.scss */ +/* line 215, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label { right: 5px; left: 5px; } -/* line 219, ../sass/plots/_plots-main.scss */ +/* line 222, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-x { top: 0; } -/* line 222, ../sass/plots/_plots-main.scss */ +/* line 225, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-y { right: 0; left: 0; } @@ -2470,7 +2488,7 @@ input[type="text"] { height: 5px; margin-top: -7px; top: 70%; } - /* line 54, ../sass/_mixins.scss */ + /* line 87, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { content: ''; display: block; @@ -2481,7 +2499,7 @@ input[type="text"] { top: 2px; left: 5px; right: 5px; } - /* line 75, ../sass/_mixins.scss */ + /* line 108, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } /* line 42, ../sass/helpers/_splitter.scss */ @@ -2503,7 +2521,7 @@ input[type="text"] { width: 5px; margin-left: -7px; left: 85%; } - /* line 54, ../sass/_mixins.scss */ + /* line 87, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { content: ''; display: block; @@ -2514,7 +2532,7 @@ input[type="text"] { left: 2px; bottom: 5px; top: 5px; } - /* line 75, ../sass/_mixins.scss */ + /* line 108, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 854a0d93d0..5321766388 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -2,7 +2,7 @@ ul.tree { margin: 0; padding: 0; } - /* line 134, ../sass/_mixins.scss */ + /* line 167, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.eot new file mode 100755 index 0000000000..c96cbe2bd1 Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.svg new file mode 100755 index 0000000000..3621cccd4c --- /dev/null +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.svg @@ -0,0 +1,55 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata>Generated by IcoMoon</metadata> +<defs> +<font id="wtdsymbols-v2" horiz-adv-x="1024"> +<font-face units-per-em="1024" ascent="960" descent="-64" /> +<missing-glyph horiz-adv-x="1024" /> +<glyph unicode=" " d="" horiz-adv-x="512" /> +<glyph unicode="!" d="M832 960h-640c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM640 128c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v64c0 35.2 28.8 64 64 64h128c35.2 0 64-28.8 64-64v-64zM696.062 768.494l-48.124-384.988c-4.366-34.928-36.738-63.506-71.938-63.506h-128c-35.2 0-67.572 28.578-71.938 63.506l-48.124 384.988c-4.366 34.928 20.862 63.506 56.062 63.506h256c35.2 0 60.428-28.578 56.062-63.506z" /> +<glyph unicode="*" d="M1004.166 619.542l-97.522 168.916-330.534-229.414 33.414 400.956h-195.048l33.414-400.956-330.534 229.414-97.522-168.916 363.944-171.542-363.944-171.542 97.522-168.916 330.534 229.414-33.414-400.956h195.048l-33.414 400.956 330.534-229.414 97.522 168.916-363.944 171.542z" /> +<glyph unicode="+" d="M630 0c0-35.2-28.8-64-64-64h-108c-35.2 0-64 28.8-64 64v896c0 35.2 28.8 64 64 64h108c35.2 0 64-28.8 64-64v-896zM64 320c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h896c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64h-896z" /> +<glyph unicode="." d="M704 384c0-70.4-57.6-128-128-128h-128c-70.4 0-128 57.6-128 128v128c0 70.4 57.6 128 128 128h128c70.4 0 128-57.6 128-128v-128zM1024 448l-192 320v-640zM0 448l192 320v-640z" /> +<glyph unicode="2" d="M1024 960l-640-640-384 384v-384l384-384 640 640z" /> +<glyph unicode="5" d="M512 960l512-448h-1024zM0 384l512-448 512 448z" /> +<glyph unicode="6" d="M1022.294 448c-1.746 7.196-3.476 14.452-5.186 21.786-20.036 85.992-53.302 208.976-98 306.538-22.42 48.938-45.298 86.556-69.946 115.006-48.454 55.93-98.176 67.67-131.356 67.67s-82.902-11.74-131.356-67.672c-24.648-28.45-47.528-66.068-69.948-115.006-44.696-97.558-77.962-220.544-98-306.538-21.646-92.898-46.444-175.138-71.71-237.836-16.308-40.46-30.222-66.358-40.6-82.604-10.378 16.246-24.292 42.142-40.6 82.604-23.272 57.75-46.144 132.088-66.524 216.052h-197.362c1.746-7.196 3.476-14.452 5.186-21.786 20.036-85.992 53.302-208.976 98-306.538 22.42-48.938 45.298-86.556 69.946-115.006 48.454-55.932 98.176-67.672 131.356-67.672s82.902 11.74 131.356 67.672c24.648 28.45 47.528 66.068 69.948 115.006 44.696 97.558 77.962 220.544 98 306.538 21.646 92.898 46.444 175.138 71.71 237.836 16.308 40.46 30.222 66.358 40.6 82.604 10.378-16.246 24.292-42.142 40.6-82.604 23.274-57.748 46.146-132.086 66.526-216.050h197.36z" /> +<glyph unicode="9" d="M448 640c0-70.4-57.6-128-128-128h-192c-70.4 0-128 57.6-128 128v192c0 70.4 57.6 128 128 128h192c70.4 0 128-57.6 128-128v-192zM1024 640c0-70.4-57.6-128-128-128h-192c-70.4 0-128 57.6-128 128v192c0 70.4 57.6 128 128 128h192c70.4 0 128-57.6 128-128v-192zM1024 64c0-70.4-57.6-128-128-128h-192c-70.4 0-128 57.6-128 128v192c0 70.4 57.6 128 128 128h192c70.4 0 128-57.6 128-128v-192zM448 64c0-70.4-57.6-128-128-128h-192c-70.4 0-128 57.6-128 128v192c0 70.4 57.6 128 128 128h192c70.4 0 128-57.6 128-128v-192z" /> +<glyph unicode="<" d="M256 448l512-512v1024z" /> +<glyph unicode=">" d="M768 448l-512 512v-1024z" /> +<glyph unicode="A" d="M450 448c0-124.264-100.736-225-225-225s-225 100.736-225 225c0 124.264 100.736 225 225 225s225-100.736 225-225zM320 576h512v-256h-512v256zM512 960v-256l256-256-256-256v-256l512 512z" /> +<glyph unicode="B" d="M192 960c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h64v1024h-64zM384 960h256v-1024h-256v1024zM832 960h-64v-704h256v512c0 105.6-86.4 192-192 192z" /> +<glyph unicode="C" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM768 384h-256c-35.2 0-64 28.8-64 64v384c0 35.2 28.8 64 64 64s64-28.8 64-64v-320h192c35.2 0 64-28.8 64-64s-28.8-64-64-64z" /> +<glyph unicode="D" d="M1024 768c0-106.039-229.23-192-512-192s-512 85.961-512 192c0 106.039 229.23 192 512 192s512-85.961 512-192zM512 448c-282.77 0-512 85.962-512 192v-512c0-106.038 229.23-192 512-192s512 85.962 512 192v512c0-106.038-229.23-192-512-192z" /> +<glyph unicode="F" d="M210 704h686c0 70.4-57.6 128-128 128h-320v64c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-643l59.102 325.064c12.594 69.266 80.498 125.936 150.898 125.936zM914 640h-640c-70.4 0-138.304-56.67-150.898-125.936l-82.204-452.128c-12.594-69.266 34.702-125.936 105.102-125.936h640c70.4 0 138.304 56.67 150.898 125.936l82.206 452.13c12.592 69.264-34.704 125.934-105.104 125.934z" /> +<glyph unicode="G" d="M1024 384v128l-140.976 35.244c-8.784 32.922-21.818 64.106-38.504 92.918l74.774 124.622-90.51 90.51-124.622-74.774c-28.812 16.686-59.996 29.72-92.918 38.504l-35.244 140.976h-128l-35.244-140.976c-32.922-8.784-64.106-21.818-92.918-38.504l-124.622 74.774-90.51-90.51 74.774-124.622c-16.686-28.812-29.72-59.996-38.504-92.918l-140.976-35.244v-128l140.976-35.244c8.784-32.922 21.818-64.106 38.504-92.918l-74.774-124.622 90.51-90.51 124.622 74.774c28.812-16.686 59.996-29.72 92.918-38.504l35.244-140.976h128l35.244 140.976c32.922 8.784 64.106 21.818 92.918 38.504l124.622-74.774 90.51 90.51-74.774 124.622c16.686 28.812 29.72 59.996 38.504 92.918l140.976 35.244zM704 448c0-106.038-85.962-192-192-192s-192 85.962-192 192 85.962 192 192 192 192-85.962 192-192z" /> +<glyph unicode="L" d="M448 960h-256c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h256v1024zM832 960h-256v-577.664h448v385.664c0 105.6-86.4 192-192 192zM576-64h256c105.6 0 192 86.4 192 192v129.664h-448v-321.664z" /> +<glyph unicode="M" d="M1024 64l-201.662 201.662c47.922 72.498 73.662 157.434 73.662 246.338 0 119.666-46.6 232.168-131.216 316.784s-197.118 131.216-316.784 131.216-232.168-46.6-316.784-131.216-131.216-197.118-131.216-316.784 46.6-232.168 131.216-316.784 197.118-131.216 316.784-131.216c88.904 0 173.84 25.74 246.338 73.662l201.662-201.662 128 128zM448 256c-141.16 0-256 114.842-256 256 0 141.16 114.84 256 256 256 141.158 0 256-114.84 256-256 0-141.158-114.842-256-256-256z" /> +<glyph unicode="O" d="M704 640h64c70.4 0 128 57.6 128 128v64c0 70.4-57.6 128-128 128h-64c-70.4 0-128-57.6-128-128v-64c0-70.4 57.6-128 128-128zM256 640h64c70.4 0 128 57.6 128 128v64c0 70.4-57.6 128-128 128h-64c-70.4 0-128-57.6-128-128v-64c0-70.4 57.6-128 128-128zM832 576h-192c-34.908 0-67.716-9.448-96-25.904 57.278-33.324 96-95.404 96-166.096v-448h384v448c0 105.6-86.4 192-192 192zM384 576h-192c-105.6 0-192-86.4-192-192v-448h576v448c0 105.6-86.4 192-192 192z" /> +<glyph unicode="Q" d="M832 320c105.6 0 192 86.4 192 192v256c0 105.6-86.4 192-192 192v-320l-128 64-128-64v320h-384c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v192c0-105.6-86.4-192-192-192h-640v192h640z" /> +<glyph unicode="S" d="M256 704h384v-128h-384v128zM384 512h384v-128h-384v128zM320 320h384v-128h-384v128zM832 960h-128v-192h127.656c0.118-0.1 0.244-0.226 0.344-0.344v-639.312c-0.1-0.118-0.224-0.244-0.344-0.344h-127.656v-192h128c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM320 128h-127.656c-0.118 0.1-0.244 0.224-0.344 0.344v639.312c0.1 0.118 0.224 0.244 0.344 0.344h127.656v192h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192z" /> +<glyph unicode="T" d="M720.648 384h-127.296c25.016-93.406 48.476-144.436 63.648-168.54 15.172 24.104 38.632 75.134 63.648 168.54zM796.086 207.228c-15.464-35.792-31.2-63.246-48.102-83.93-18.374-22.49-49.076-49.298-90.984-49.298s-72.61 26.808-90.984 49.298c-16.902 20.684-32.636 48.138-48.102 83.93-23.648 54.726-42.732 120.406-56.688 176.772h-457.25c31.496-252.562 246.93-448 508.024-448s476.528 195.438 508.024 448h-167.252c-13.954-56.364-33.038-122.044-56.686-176.772zM303.352 512h127.296c-25.016 93.406-48.476 144.436-63.648 168.538-15.172-24.102-38.632-75.132-63.648-168.538zM276.016 772.702c18.374 22.49 49.076 49.298 90.984 49.298s72.61-26.808 90.984-49.298c16.902-20.684 32.636-48.138 48.102-83.93 23.648-54.726 42.732-120.406 56.688-176.772h457.252c-31.498 252.562-246.932 448-508.026 448s-476.528-195.438-508.024-448h167.252c13.956 56.366 33.040 122.044 56.688 176.772 15.462 35.792 31.198 63.244 48.1 83.93z" /> +<glyph unicode="Z" d="M832 832h-192.36v64c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-64h-191.64c-105.6 0-192-72-192-160s0-160 0-160h64v-384c0-105.6 86.4-192 192-192h512c105.6 0 192 86.4 192 192v384h64c0 0 0 72 0 160s-86.4 160-192 160zM320 128h-128v384h128v-384zM576 128h-128v384h128v-384zM832 128h-128v384h128v-384z" /> +<glyph unicode="^" d="M512 704l-512-512h1024z" /> +<glyph unicode="_" d="M191.656 128c0.118-0.1 0.244-0.224 0.344-0.344v-191.656h192v192c0 105.6-86.4 192-192 192h-192v-192h191.656zM192 768.344c-0.1-0.118-0.224-0.244-0.344-0.344h-191.656v-192h192c105.6 0 192 86.4 192 192v192h-192v-191.656zM832 576h192v192h-191.656c-0.118 0.1-0.244 0.226-0.344 0.344v191.656h-192v-192c0-105.6 86.4-192 192-192zM832 127.656c0.1 0.118 0.224 0.244 0.344 0.344h191.656v192h-192c-105.6 0-192-86.4-192-192v-192h192v191.656z" /> +<glyph unicode="d" d="M683.52 140.714c-50.782-28.456-109.284-44.714-171.52-44.714-194.094 0-352 157.906-352 352s157.906 352 352 352 352-157.906 352-352c0-62.236-16.258-120.738-44.714-171.52l191.692-191.692c8.516 13.89 13.022 28.354 13.022 43.212v640c0 106.038-229.23 192-512 192s-512-85.962-512-192v-640c0-106.038 229.23-192 512-192 126.11 0 241.548 17.108 330.776 45.46l-159.256 159.254zM352 448c0-88.224 71.776-160 160-160s160 71.776 160 160-71.776 160-160 160-160-71.776-160-160z" /> +<glyph unicode="l" d="M0 448l256-256v512zM512 960l-256-256h512zM512-64l256 256h-512zM768 704v-512l256 256z" /> +<glyph unicode="o" d="M512-64l512 320v384l-512.020 320-511.98-320v-384l512-320zM512 768l358.4-224-358.4-224-358.4 224 358.4 224z" /> +<glyph unicode="p" d="M922.344 858.32c-38.612 38.596-81.306 69.232-120.304 86.324-68.848 30.25-104.77 9.078-120.194-6.344l-516.228-516.216-3.136-9.152-162.482-476.932 485.998 165.612 6.73 6.806 509.502 509.506c9.882 9.866 21.768 27.77 21.768 56.578 0.002 50.71-38.996 121.148-101.654 183.818zM237.982 104.34l-69.73 69.728 69.25 203.228 18.498 6.704h64v-128h128v-64l-6.846-18.506-203.172-69.154z" /> +<glyph unicode="t" d="M171.226 512c13.956 56.366 33.040 122.044 56.688 176.772 15.466 35.792 31.2 63.246 48.1 83.93 18.376 22.49 49.078 49.298 90.986 49.298s72.61-26.808 90.986-49.298c16.9-20.684 32.634-48.138 48.1-83.93 23.648-54.726 42.732-120.406 56.688-176.772h461.226v256c0 105.6-86.4 192-192 192h-640c-105.6 0-192-86.4-192-192v-256h171.226zM720.648 384h-127.296c25.016-93.406 48.476-144.436 63.648-168.54 15.172 24.104 38.632 75.134 63.648 168.54zM303.352 512h127.294c-25.016 93.406-48.476 144.436-63.648 168.538-15.17-24.102-38.628-75.132-63.646-168.538zM852.774 384c-13.956-56.364-33.040-122.044-56.688-176.772-15.464-35.792-31.2-63.246-48.102-83.93-18.374-22.49-49.076-49.298-90.984-49.298s-72.61 26.808-90.984 49.298c-16.902 20.684-32.636 48.138-48.102 83.93-23.648 54.726-42.732 120.406-56.688 176.772h-461.226v-256c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v256h-171.226z" /> +<glyph unicode="v" d="M512 192l512 512h-1024z" /> +<glyph unicode="x" d="M384 448l-365.332-365.332c-24.89-24.89-24.89-65.62 0-90.51l37.49-37.49c24.89-24.89 65.62-24.89 90.51 0 0 0 365.332 365.332 365.332 365.332l365.332-365.332c24.89-24.89 65.62-24.89 90.51 0l37.49 37.49c24.89 24.89 24.89 65.62 0 90.51l-365.332 365.332c0 0 365.332 365.332 365.332 365.332 24.89 24.89 24.89 65.62 0 90.51l-37.49 37.49c-24.89 24.89-65.62 24.89-90.51 0 0 0-365.332-365.332-365.332-365.332l-365.332 365.332c-24.89 24.89-65.62 24.89-90.51 0l-37.49-37.49c-24.89-24.89-24.89-65.62 0-90.51 0 0 365.332-365.332 365.332-365.332z" /> +<glyph unicode="y" d="M448 960v-128h320l-384-384 128-128 384 384v-320h128v576zM576 285.726v-157.382c-0.1-0.118-0.226-0.244-0.344-0.344h-383.312c-0.118 0.1-0.244 0.226-0.344 0.344v383.312c0.1 0.118 0.226 0.244 0.344 0.344h157.382l192 192h-349.726c-105.6 0-192-86.4-192-192v-384c0-105.6 86.4-192 192-192h384c105.6 0 192 86.4 192 192v349.726l-192-192z" /> +<glyph unicode="z" d="M192.344 128c-0.118 0.1-0.244 0.224-0.344 0.344v191.656h-192v-192c0-105.6 86.4-192 192-192h192v192h-191.656zM192 767.656c0.1 0.118 0.224 0.244 0.344 0.344h191.656v192h-192c-105.6 0-192-86.4-192-192v-192h192v191.656zM832 960h-192v-192h191.656c0.118-0.1 0.244-0.226 0.344-0.344v-191.656h192v192c0 105.6-86.4 192-192 192zM832 128.344c-0.1-0.118-0.224-0.244-0.344-0.344h-191.656v-192h192c105.6 0 192 86.4 192 192v192h-192v-191.656z" /> +<glyph unicode="{" d="M766-64l-256 512 256 512h-256l-256-512 256-512z" /> +<glyph unicode="}" d="M254 960l256-512-256-512h256l256 512-256 512z" /> +<glyph unicode="" d="M704 448l301.332-301.332c24.89-24.89 24.89-65.62 0-90.51l-101.49-101.49c-24.89-24.89-65.62-24.89-90.51 0l-301.332 301.332c0 0-301.332-301.332-301.332-301.332-24.89-24.89-65.62-24.89-90.51 0l-101.49 101.49c-24.89 24.89-24.89 65.62 0 90.51l301.332 301.332c0 0-301.332 301.332-301.332 301.332-24.89 24.89-24.89 65.62 0 90.51l101.49 101.49c24.89 24.89 65.62 24.89 90.51 0l301.332-301.332c0 0 301.332 301.332 301.332 301.332 24.89 24.89 65.62 24.89 90.51 0l101.49-101.49c24.89-24.89 24.89-65.62 0-90.51 0 0-301.332-301.332-301.332-301.332z" /> +<glyph unicode="" d="M960 640h-256v256c0 35.2-28.8 64-64 64h-256c-35.2 0-64-28.8-64-64v-256h-256c-35.2 0-64-28.8-64-64v-256c0-35.2 28.8-64 64-64h256v-256c0-35.2 28.8-64 64-64h256c35.2 0 64 28.8 64 64v256h256c35.2 0 64 28.8 64 64v256c0 35.2-28.8 64-64 64z" /> +<glyph unicode="" d="M640 576h-128v128h-128v-128h-128v-128h128v-128h128v128h128zM1024 64l-201.662 201.662c47.922 72.498 73.662 157.434 73.662 246.338 0 119.666-46.6 232.168-131.216 316.784s-197.118 131.216-316.784 131.216c-119.666 0-232.168-46.6-316.784-131.216s-131.216-197.118-131.216-316.784c0-119.666 46.6-232.168 131.216-316.784s197.118-131.216 316.784-131.216c88.904 0 173.84 25.74 246.338 73.662l201.662-201.662 128 128zM448 256c-141.16 0-256 114.842-256 256 0 141.16 114.84 256 256 256 141.158 0 256-114.84 256-256 0-141.158-114.842-256-256-256z" /> +<glyph unicode="" d="M256 576h384v-128h-384v128zM1024 64l-201.662 201.662c47.922 72.498 73.662 157.434 73.662 246.338 0 119.666-46.6 232.168-131.216 316.784s-197.118 131.216-316.784 131.216c-119.666 0-232.168-46.6-316.784-131.216s-131.216-197.118-131.216-316.784c0-119.666 46.6-232.168 131.216-316.784s197.118-131.216 316.784-131.216c88.904 0 173.84 25.74 246.338 73.662l201.662-201.662 128 128zM448 256c-141.16 0-256 114.842-256 256 0 141.16 114.84 256 256 256 141.158 0 256-114.84 256-256 0-141.158-114.842-256-256-256z" /> +<glyph unicode="" d="M210 704h686c0 70.4-57.6 128-128 128h-320v64c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-643l59.102 325.064c12.594 69.266 80.498 125.936 150.898 125.936zM914 640h-640c-70.4 0-138.304-56.67-150.898-125.936l-82.204-452.128c-12.594-69.266 34.702-125.936 105.102-125.936h640c70.4 0 138.304 56.67 150.898 125.936l82.206 452.13c12.592 69.264-34.704 125.934-105.104 125.934zM734.248 192h-128l-23.386-128h-192l23.386 128h-128l35.078 192h128l23.386 128h192l-23.386-128h128l-35.078-192z" /> +<glyph unicode="" d="M1024 448l-448-512v1024zM448 960l-448-512 448-512z" /> +<glyph unicode="" d="M517.98 960l-511.98-320v-512c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v512l-512.020 320zM518 768l358.4-224-358.4-224-358.4 224 358.4 224z" /> +<glyph unicode="" d="M998.208 111.136l-422.702 739.728c-34.928 61.124-92.084 61.124-127.012 0l-422.702-739.728c-34.928-61.126-5.906-111.136 64.494-111.136h843.428c70.4 0 99.422 50.010 64.494 111.136zM512 128c-35.2 0-64 28.8-64 64s28.8 64 64 64 64-28.8 64-64c0-35.2-28.8-64-64-64zM627.448 577.242l-38.898-194.486c-6.902-34.516-41.35-62.756-76.55-62.756s-69.648 28.24-76.552 62.758l-38.898 194.486c-6.902 34.516 16.25 62.756 51.45 62.756h128c35.2 0 58.352-28.24 51.448-62.758z" /> +<glyph unicode="" d="M255.884 256c0.040 0.034 0.082 0.074 0.116 0.116v127.884c0 70.58 57.42 128 128 128h255.884c0.040 0.034 0.082 0.074 0.116 0.116v127.884c0 70.58 57.42 128 128 128h143.658c-93.832 117.038-237.98 192-399.658 192-282.77 0-512-229.23-512-512 0-67.904 13.25-132.704 37.256-192h218.628zM768.116 640c-0.040-0.034-0.082-0.074-0.116-0.116v-127.884c0-70.58-57.42-128-128-128h-255.884c-0.040-0.034-0.082-0.074-0.116-0.116v-127.884c0-70.58-57.42-128-128-128h-143.658c93.832-117.038 237.98-192 399.658-192 282.77 0 512 229.23 512 512 0 67.904-13.25 132.704-37.256 192h-218.628z" /> +</font></defs></svg> \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.ttf new file mode 100755 index 0000000000..2ba029aaa8 Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.woff new file mode 100755 index 0000000000..c0ce74f752 Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.woff differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index a650f0fc66..41d6a656f9 100644 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 22afe8758d..18ffd151d4 100644 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -2,9 +2,9 @@ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > <svg> <metadata> -Created by FontForge 20110222 at Wed Dec 31 17:02:29 2014 +Created by FontForge 20110222 at Mon Feb 23 21:13:56 2015 By deploy user -Copyright 2014 Adobe Systems Incorporated. All rights reserved. +Copyright 2015 Adobe Systems Incorporated. All rights reserved. </metadata> <defs> <font id="WTDSymbols" horiz-adv-x="500" > @@ -117,6 +117,12 @@ q2 58 13 103.5t24 66t24 20.5zM282 666q-54 0 -85 -73.5t-39 -179.5h-158q14 142 120 d="M800 733l-396 -397l-397 397h793zM69 0q-29 0 -49 20t-20 49v123q0 29 20 49t49 20h671q28 0 48.5 -20.5t20.5 -48.5v-123q0 -28 -20.5 -48.5t-48.5 -20.5h-671z" /> <glyph glyph-name="V" unicode="V" horiz-adv-x="679" d="M339 727l340 -236v-491h-340h-339v491zM339 255l252 176l-252 174l-252 -174z" /> + <glyph glyph-name="X" unicode="X" horiz-adv-x="753" +d="M471 471v-95h-95v-94h-94v94h-94v95h94v94h94v-94h95zM753 94l-94 -94l-149 149q-81 -55 -181 -55q-137 0 -232 97q-97 95 -97 233q0 137 97 232q95 97 232 97q138 0 233 -97q97 -95 97 -232q0 -100 -55 -181zM329 235q79 0 134 55t55 134q0 78 -55 133t-134 55 +q-78 0 -133 -55t-55 -133q0 -79 55 -134t133 -55z" /> + <glyph glyph-name="Y" unicode="Y" +d="M471 471v-95h-283v95h283zM753 94l-94 -94l-149 149q-81 -55 -181 -55q-137 0 -232 97q-97 95 -97 233q0 137 97 232q95 97 232 97q138 0 233 -97q97 -95 97 -232q0 -100 -55 -181zM329 235q79 0 134 55t55 134q0 78 -55 133t-134 55q-78 0 -133 -55t-55 -133 +q0 -79 55 -134t133 -55z" /> <glyph glyph-name="Z" unicode="Z" horiz-adv-x="808" d="M808 573v-129h-79v-371q0 -29 -22 -51t-52 -22h-502q-30 0 -51.5 21.5t-21.5 51.5v371h-80v129q0 30 21.5 51.5t51.5 21.5h247v41q0 20 15.5 34.5t37.5 14.5h62q22 0 37 -14.5t15 -34.5v-41h248q30 0 51.5 -21.5t21.5 -51.5zM172 88h83v356h-83v-356zM362 88h83v356h-83 v-356zM635 88v356h-83v-356h83z" /> diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index afde7cd252..c8147b6a99 100644 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 37ef316257..d419defd6b 100644 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/_effects.scss b/platform/commonUI/general/res/sass/_effects.scss index 76e25f9874..7f0e6f37eb 100644 --- a/platform/commonUI/general/res/sass/_effects.scss +++ b/platform/commonUI/general/res/sass/_effects.scss @@ -14,6 +14,10 @@ a.disabled { @include boxOutline(); } +.test-stripes { + @include bgDiagonalStripes(); +} + .test { @include test(); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_fonts.scss b/platform/commonUI/general/res/sass/_fonts.scss index 5292c5669e..a7b51298ed 100644 --- a/platform/commonUI/general/res/sass/_fonts.scss +++ b/platform/commonUI/general/res/sass/_fonts.scss @@ -1,3 +1,17 @@ +@font-face { + /* + * Use https://www.web-font-generator.com/ to gen fonts + */ + font-family: 'symbolsfont'; + src: url('../fonts/symbols/wtdsymbols.eot'); + src: url('../fonts/symbols/wtdsymbols.eot?#iefix') format('embedded-opentype'), + url('../fonts/symbols/wtdsymbols.woff') format('woff'), + url('../fonts/symbols/wtdsymbols.ttf') format('truetype'), + url('../fonts/symbols/wtdsymbols.svg#armataregular') format('svg'); + font-weight: normal; + font-style: normal; +} + .ui-symbol { font-family: 'symbolsfont'; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 6d6a949c8a..4036672870 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -1,18 +1,3 @@ -@font-face { - /* - * Use https://www.web-font-generator.com/ to gen fonts - */ - font-family: 'symbolsfont'; - src: url('../fonts/symbols/wtdsymbols.eot'); - src: url('../fonts/symbols/wtdsymbols.eot?#iefix') format('embedded-opentype'), - url('../fonts/symbols/wtdsymbols.woff') format('woff'), - url('../fonts/symbols/wtdsymbols.woff2') format('woff2'), - url('../fonts/symbols/wtdsymbols.ttf') format('truetype'), - url('../fonts/symbols/wtdsymbols.svg#armataregular') format('svg'); - font-weight: normal; - font-style: normal; -} - a { color: #ccc; cursor: pointer; @@ -80,6 +65,10 @@ span { white-space: pre; } +.align-right { + text-align: right; +} + .centered { text-align: center; } diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index cb9522286a..236bc6fc0f 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -1,6 +1,19 @@ -@mixin trans-prop-nice-resize-h() { +@mixin absPosDefault($offset: 0px, $overflowHidden: hidden) { + overflow: $overflowHidden; + position: absolute; + top: $offset; right: $offset; bottom: $offset; left: $offset; + width: auto; height: auto; +} + +@mixin trans-prop-nice-fade($t: 0.5s) { + @include transition-property(visibility, opacity, background-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(0.4s); + @include transition-duration($t); @include transition-timing-function(ease-in-out); } @@ -24,6 +37,26 @@ border-right: $size/$ratio solid transparent; } +@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 0 + )); + background-repeat: repeat; + background-size: $d $d; +} + +@mixin bgTicks($c: $colorBodyFg) { + $c: $c; + @include background-image(linear-gradient(90deg, + $c 1px, transparent 1px, + transparent 100% + )); + background-repeat: repeat-x; +} + @mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { @include background-image(linear-gradient(lighten($bg, 10%), lighten($bg, 5%))); @include border-radius($controlCr); @@ -147,6 +180,22 @@ transform: translateY(-50%); } +@mixin ellipsize() { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +@mixin scrollH($showBar: auto) { + overflow-x: $showBar; + overflow-y: hidden; +} + +@mixin scrollV($showBar: auto) { + overflow-x: hidden; + overflow-y: $showBar; +} + @mixin wait-spinner($b: 5px, $c: $colorAlt1) { display: block; position: absolute; @@ -163,4 +212,23 @@ @mixin test($c: #ffcc00, $a: 0.2) { background-color: rgba($c, $a); +} + + + +@mixin testObj($w: 2000px, $h: 1000px, $c: black, $a: 0.1) { + &:after { + @include box-sizing(border-box); + @include bgDiagonalStripes($c, $a); + color: rgba(white, 0.3); + font-style: italic; + content: "Test Object"; + display: block; + padding: 20px; + position: relative; + width: $w; + height: $h; + transform: scaleX(1) scaleY(1) scaleZ(1); + transform-origin: 50% 50% 0; + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 75f2165e85..e0304db48b 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -62,14 +62,16 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa border: 1px solid $colorInteriorBorder; } - .gl-plot-label { + .gl-plot-label, + .l-plot-label { // @include test(yellow); color: lighten($colorBodyFg, 20%); position: absolute; text-align: center; // text-transform: uppercase; - &.gl-plot-x-label { + &.gl-plot-x-label, + &.l-plot-x-label { top: auto; right: 0; bottom: 0; @@ -77,7 +79,8 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa height: auto; } - &.gl-plot-y-label { + &.gl-plot-y-label, + &.l-plot-y-label { $x: -50%; $r: -90deg; @include transform-origin(50%, 0); diff --git a/platform/commonUI/general/src/controllers/SplitPaneController.js b/platform/commonUI/general/src/controllers/SplitPaneController.js index 85ecb6061a..b5ead00cd0 100644 --- a/platform/commonUI/general/src/controllers/SplitPaneController.js +++ b/platform/commonUI/general/src/controllers/SplitPaneController.js @@ -5,16 +5,18 @@ define( function () { "use strict"; + var DEFAULT_MAXIMUM = 1000, + DEFAULT_MINIMUM = 120; + /** * Controller for the splitter in Browse mode. Current implementation * uses many hard-coded constants; this could be generalized. * @constructor */ function SplitPaneController() { - var minimum = 120, - maximum = 600, - current = 200, - start = 200; + var current = 200, + start = 200, + assigned = false; return { /** @@ -22,7 +24,13 @@ define( * from the left edge. * @returns {number} position of the splitter, in pixels */ - state: function () { + state: function (defaultState) { + // Set the state to the desired default, if we don't have a + // "real" current state yet. + if (arguments.length > 0 && !assigned) { + current = defaultState; + assigned = true; + } return current; }, /** @@ -40,7 +48,12 @@ define( * splitter when startMove was last invoked. * @param {number} delta number of pixels to move */ - move: function (delta) { + move: function (delta, minimum, maximum) { + // Ensure defaults for minimum/maximum + maximum = isNaN(maximum) ? DEFAULT_MAXIMUM : maximum; + minimum = isNaN(minimum) ? DEFAULT_MINIMUM : minimum; + + // Update current splitter state current = Math.min( maximum, Math.max(minimum, start + delta) diff --git a/platform/commonUI/general/test/controllers/SplitPaneControllerSpec.js b/platform/commonUI/general/test/controllers/SplitPaneControllerSpec.js index 03b65dac62..e4984aba60 100644 --- a/platform/commonUI/general/test/controllers/SplitPaneControllerSpec.js +++ b/platform/commonUI/general/test/controllers/SplitPaneControllerSpec.js @@ -41,6 +41,13 @@ define( expect(controller.state() > initialState).toBeTruthy(); }); + it("accepts a default state", function () { + // Should use default state the first time... + expect(controller.state(12321)).toEqual(12321); + // ...but not after it's been initialized + expect(controller.state(42)).toEqual(12321); + }); + }); } ); \ No newline at end of file