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 84b5eff20a..84a5c25eee 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'; } @@ -502,7 +515,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; } @@ -514,7 +527,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; } @@ -657,7 +670,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); @@ -826,7 +839,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); @@ -860,7 +873,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); @@ -897,7 +910,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); @@ -925,7 +938,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); @@ -1125,7 +1138,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); @@ -1282,14 +1295,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; @@ -1300,7 +1313,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 */ @@ -1422,7 +1435,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; @@ -1764,7 +1777,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); @@ -2033,20 +2046,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; @@ -2062,7 +2080,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%; @@ -2073,19 +2091,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; @@ -2096,20 +2114,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, @@ -2128,16 +2146,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; @@ -2145,7 +2163,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 { @@ -2156,7 +2174,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 { @@ -2166,18 +2184,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; } @@ -2485,7 +2503,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; @@ -2496,7 +2514,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 */ @@ -2518,7 +2536,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; @@ -2529,7 +2547,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 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ -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. @@ -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" /> + + 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 diff --git a/platform/core/bundle.json b/platform/core/bundle.json index 4ed15b818c..c986bc8a74 100644 --- a/platform/core/bundle.json +++ b/platform/core/bundle.json @@ -5,7 +5,7 @@ "extensions": { "versions": [ { - "name": "Open MCT Web", + "name": "Version", "value": "${project.version}", "priority": 999 }, diff --git a/platform/persistence/cache/test/CachingPersistenceDecoratorSpec.js b/platform/persistence/cache/test/CachingPersistenceDecoratorSpec.js index 4088fda79e..115ea208b2 100644 --- a/platform/persistence/cache/test/CachingPersistenceDecoratorSpec.js +++ b/platform/persistence/cache/test/CachingPersistenceDecoratorSpec.js @@ -88,6 +88,36 @@ define( expect(mockCallback.calls[0].args[0]) .toBe(mockCallback.calls[1].args[0]); }); + + it("maintains the same cached instance between reads/writes", function () { + var testObject = { abc: "XYZ!" }; + + // Perform two reads with a write in between + decorator.readObject(testSpace, "someKey", "someValue") + .then(mockCallback); + decorator.updateObject(testSpace, "someKey", testObject); + decorator.readObject(testSpace, "someKey", "someValue") + .then(mockCallback); + + // Results should have been pointer-identical + expect(mockCallback.calls[0].args[0]) + .toBe(mockCallback.calls[1].args[0]); + + // But contents should have been equal to the written object + expect(mockCallback).toHaveBeenCalledWith(testObject); + }); + + it("is capable of reading/writing strings", function () { + // Efforts made to keep cached objects pointer-identical + // would break on strings - so make sure cache isn't + // breaking when we read/write strings. + decorator.createObject(testSpace, "someKey", "someValue"); + decorator.updateObject(testSpace, "someKey", "someOtherValue"); + decorator.readObject(testSpace, "someKey").then(mockCallback); + expect(mockCallback).toHaveBeenCalledWith("someOtherValue"); + + + }); }); } ); \ No newline at end of file