From 3cb0f3fa7f06a7a8ca40842ea7a1e02d1bd6c2d8 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 12 Feb 2015 16:09:29 -0800 Subject: [PATCH 1/3] [Tests] Add tests for persistence cache Add test cases for persistence cache to improve overall test coverage, WTD-672. --- .../test/CachingPersistenceDecoratorSpec.js | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) 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 From e9dbc3d71f273ac9151fcf9f59fc62957da4b891 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 12 Feb 2015 16:51:24 -0800 Subject: [PATCH 2/3] [About] Change version text Change version text to just say Version instead of Open MCT Web, WTD-829. --- platform/core/bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }, From f523022a2ad3270ccfa8549096beb26c4948d8c4 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 25 Feb 2015 11:25:20 -0800 Subject: [PATCH 3/3] [Styles] Merge in style updates Merge in style updates and split pane updates related to timeline view into open-source-friendly branch, WTD-901 --- platform/commonUI/general/res/css/forms.css | 2 +- platform/commonUI/general/res/css/items.css | 4 +- platform/commonUI/general/res/css/plots.css | 51 +++--- .../general/res/css/theme-espresso.css | 152 ++++++++++-------- platform/commonUI/general/res/css/tree.css | 2 +- .../res/fonts/symbols/wtdsymbols-v2.eot | Bin 0 -> 7028 bytes .../res/fonts/symbols/wtdsymbols-v2.svg | 55 +++++++ .../res/fonts/symbols/wtdsymbols-v2.ttf | Bin 0 -> 6840 bytes .../res/fonts/symbols/wtdsymbols-v2.woff | Bin 0 -> 6916 bytes .../general/res/fonts/symbols/wtdsymbols.eot | Bin 8684 -> 8940 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 10 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 8520 -> 8776 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 6188 -> 6308 bytes .../commonUI/general/res/sass/_effects.scss | 4 + .../commonUI/general/res/sass/_fonts.scss | 14 ++ .../commonUI/general/res/sass/_global.scss | 19 +-- .../commonUI/general/res/sass/_mixins.scss | 72 ++++++++- .../general/res/sass/plots/_plots-main.scss | 9 +- .../src/controllers/SplitPaneController.js | 25 ++- .../controllers/SplitPaneControllerSpec.js | 7 + 20 files changed, 304 insertions(+), 122 deletions(-) create mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.eot create mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.svg create mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.ttf create mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.woff 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 0000000000000000000000000000000000000000..c96cbe2bd11b3fb74178d69138a2a835b355dff5 GIT binary patch literal 7028 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2ba029aaa835d5c3ba7674a61bec40cdb9c34b76 GIT binary patch literal 6840 zcmbtZYit}>6+UNXcgOE!JiFd_V>{j*?`|ITBi>zaLmFq&QbX(%Cv6p?2;4eN+7iV{ z+@vJ|0;38+p(@bF4_Z(`AVEdjsGx#`cnzo&NQ;0LApw7opcWEELPGoj?+o9$GrL|p z2};X&=iYPAoH_U2^S)zZB5Eg>bQ+tzZFGEHw|)Sa@8iDnu7&y2uWkPL7l^nI_jUKo zpE(WudLr%J=v(eNasKXC-zX+9-cOX;eDAUOqwzhreU~VG4$mj<1;Y4+{wBsRU_5m1 z!r61*q1gK{{w>BYoj7&Z{QcK|=+i_SK9BLyh52)*sY>9rVHxAWlk*G5`uw?Pin6M^VzWHzfp->g|6vhEPM6k5G@sTFYw6GapR%L zqJ9l3Ktn4tCeg~%B*l0G`WrzXCk?nPZKDwyrwQ6YH_#-#lio$Q&@3IG+vzafK}YEX zou;$&0DYJ)ENM%zrOu_ErM{)1rD9ME0`QWZY*joe5sy7IMf((w+rVQ^@i?V;oQrt0 zuj0YMpMyUJzYl&F{5E(k_;v8B;FrOx!Ow%A1uq9b4ZPq7!FPji1uq282hRo12H(gO zGWpD=Oght@Y0tDqJ5vk!KN=>+Zq_x)5VEW8P$FHC>;J|<(t#HvXk$I(Iu3?vi(Cn{#SVC%`mHqI4xad~1VkN5PmrFXGlih5xJR6U07)ZE#{#aT_YULoUV3aYt& zOy7pVHhoObW|%TrUH2AeSBRHAA#_xuxxTwGpWn!;#h#LZr@x7HnOIXXZrN7e=;U-> zFX{1WUVn4m|90-Bod4~4KH)zx&odbC%)I}EcH)^g_)-7V8_zuV+%s?Zr}$AoFxOT4 zq!yK|YQY|gX zj_%yLpI#%C7jI7t?mKW`D8D1MHIvzz+L0eRaA4oy)cMhY&7GZ_2ezHueGMeC*H}Y_ zp`G7!1)o8xQv3KMo-j;Msrr+6{yxsp;TO_uhZ1lA{0N-4@2)dbS7GDWfS@$ z_I%mPWzTf-@l4dLY%sEyB=yoJ*=d(%=SH+jc~UEl4```k*36m~49R5viM{LA(a~FX z+4cTG4ZJ+et)^>!A{1@_yJ589A67;yF{BOAC{1LAA!H|;c1dQ++Gr3;Jc$yHqj%DA3yfstsl+$|64~3|PXvNB}eL$JQs(H6vL2@i&H0vudMX)hi%hkVZ zAv$fIDh~{lr#9Dn-;Xov}wLv6RVO;)r903&lm2DJ-(b9vgCF8eo>r>D#OQh9o{yvJx4 z_Fa)kP%XmsN7*(;b%a$W_q3cY6Q+({i(W4dhK+oba{NC}39GVK-&4i$*Rpw{U2JjI_3k zvnG21ENyW%v}HzG61$#V^qm!pto@K5oLyXol|JbIaFtCKQFl-t8y8zd*tB7u2$y1^ z2$2#T)75;l!-aNoX{cc4#s&xX9ymBWeDJ{D!NIW{B4vcR>B7V%7s25DVkGac)O+XB z#D$wKr*2>hLzi5y`2~4#O}rbWcR(6g7qWN(xjTUz2LoD*h)duf;8ZB8EJhKid5#1n z)%eZ|tT|q0dum&S-NjkofqQF?lmQXt3LPM)tE2Z&MN*H5J?tUVmE1OfK~!>>MZ;{U zP8KZ*xsuf#dDTU(lRm6AYRG$xNtNzA2Pv~&U|=4P2sto{g)wTSF8I{-m?xXcR?^ZK z(y*N>UC-N1+<>ArupOaF6(xsc&rYt0wfL?pjU$alE-tkpfzN7B=sT(7sLhe%Zf!!YE>I}E&+jFM<5vQ5nseF z8yR3pGBQ`S-?&z;y*+2mbfi1GMmB94>FP{(boaIU)s90CT|9E+;zNfzzTV!~?OPGy z#%3!1#cC=rVRvf3W$mB(=Eg1S&A~x){g#be=CXVGya3 zT5qbN@~s)oNdWs6c<_i zq-v2rDJCSs`sgu6^p!rK8d{ON=wc=3Cxk~_c$jQ<^02C4{qW_x{ipn=_-=SQ!}EO) zwXdf;f5HV84IbY_{*)6e+@+8(;4t|rOSmo+xwxB4sZwek>reGh_Lq0G*Op^n;U$A> zEnU^o+U-+Q-HvO#q95)b?(8u;YRj#@{j~)9Mqf|i$Y`x=>J`Ivtecx{q@VIMOf%Sb z=z^=fQz{=7%}Vje!}F0B$CanAcJ_w(+t0#9*LX1hG7KTlYK6#k{kaIx3YU}nr7-wB zs}Y=ZmGerxl$;lNcD-9mR!@>jKVIEe^5QE}YkE+b_>mR7uK!(sp334!iR32k8Ly5_ zYTME8=81BVWiU}5jJ)zTL-%I*Z^SHf84V2R>ivSQ}^)#`n+ZNk7LllfPqPH|D9X%vki}Kvh6)WxAoi;0kPj1&3M%S}NYt7U$3(vn(DKP+>z*VS$5w zU;keuArJK;sAV7ZoHB%gI%OzbHWb?Mr^fdTFQ7t3&IRGwfHA_iiGtjP45|s$Uzw)4 z#%xDUz&AN$FgpdkL5U@Pixr{fh8MeUt1{Fa^}6rAtqQSuFEM1}Jt9A;hTh^PU@>qB zo!<5qeENUZ-#9CcA^Kj!X-T&YyJ}ZU)sj&%uIcFXqMP>8uI+B{Hn_ItUHu$|Pb;eO z6aQMtWzlyS)0WRR(bt#o6kqp6jS{F)6Y$%1`O=G|SO5IRDV6*ZK81lCc`{0W@KE@u zgeBxr$5ZJ~motyPq~AtTvuwc$MdB@oN5x{kaXdpcZG}k(&a1wE8Tyicc;oa&|8OQ> z(f3vI86SsXIS>~zX9|hoOlCMyNNmElyiJKy+FwRSYJDSn_KcVz1$^hnKgs0t8PzoJ zeL$Thr8L69P@*mRog9{{sFl(s22PId@(lep4r^V>(>Bu#3htT8=Y|g5y|_zG>sI$4 zH6VhuNR)n+8T_t$*Z4*$a7y#nA$G4tNvsgPRC}z8cdWbNU(}9Zjq5j^pL}|yk2HaA z?LwhfI0pD*5gf<&)=UH^sFS86xD9p5 zlZ5{!#9Dz7o*^9a4B?Px2!}jFIOG|^3B3E>=-rU#2k{?*qjZMO(*hl#Q~1Bb8PtIf z;5+(3I!5>(Fy@&3{MDt*ORd)Di qhD>`F6W@b3PO8PsV|)zD9mG=4quon)f$A3ALOY`Jfs*xAn*RcS_ng%L literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c0ce74f7521dadbb5ccddb29856f4661d5477b73 GIT binary patch literal 6916 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 M_RD-AWqpb6|4p!=z5oCK literal 0 HcmV?d00001 diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index a650f0fc668d3c749ca8f2b1825cde4f5c96a2f6..41d6a656f91438d67a80177bf20952be6d90056f 100644 GIT binary patch delta 818 zcmah{O-vI}5T3WY-QDgMwb~*FskAjk5d_=r7NjDAg=&BXNsxnKSt&mUT57=Xb7}OV za6rjIybul^)Ppf3J?PO8LrfH*iJ%7(3BkleNg$#z#&n%lIjWP)zW4pS%)Gags!avh zlmj5>m}F&ULYUo{tiBN+TKoavC3jHt1) zM|bW5P$}f*d(?rLt^df?p#dQ8NpF`LHr!vyL2V6F?nQ#Drq7KJk8Um=5BQA)lk*>!D)H8tm?*Md7 ztbbszuQg%>u=`Pe1q8pC8?(ZMvfuv|MEWx_kTeIU_E!C)zQqjDhY<5XftDba3Yr

zvp}>YcLV*2JcvM2zF_!rSa%+alPY2%EP$txm})c_fdOaD}YXQRtGq zKH1|woNKjk2DdDET}}sUwd9ibN;?J_X`gNmk149EjEyU*FTE9tMng@}XjVr{`gZ%Y zPgTZ$Tf)tJR&5GJ0pgi?`O^Rmxqt&ntajF-sQe^kuOCeX*Jb;t)hB#xS| mc&vPzy{>=0Qn03 z!TLsx$#S0=7#Jgf{DkD(!~&WAV1EV%rYAtLL+Odd1^@puFay=I0OdK-b1Kv3xff1l zU|@A%U=ZJvk(!vo%JEkpD0c^l%`$)j?C#8qfqF%Ne3gvcl8X9^_5Uvb1$F?jPELMu z;_)Bn_!t;ifR19Ak(*diz%ZG?6)0x`mLRNW~YMu;*uQ6oU=eF z2cY~B21XzW#Gm&b5sT-y`O3h}`~oP#aN*>gr7-&c{r_)S%9(|Md=3UChRK^5MJ#W! zl!LW`)WCo@Sj3yb2^1bczy!pMU@->}7YLY{?k{3uoXo-enlWnf7iML_^Z(ENKl}g8 z|I`0Z{XhADg@JMMMHaQmek?KS3=EoD+B&*=4EhWPhDOFF45nu07M51lHVn3Q_708= zPR=f_3~uf~_0fzTK+OnZdb$^9`35R}NPl*FLUy+$!8=+#cN1xQ}t) -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 afde7cd25208daea1fb1b981b9023809a9c25419..c8147b6a9990e2f36da053fba096e946329e619d 100644 GIT binary patch delta 775 zcmah{Ur1A76hGg++x@dUO~aW`lkMJ^WtzI}ZkEf;{IkM2%@7IkdUNU?+*~O5CusRp z`e4#kdXXLqs)q={pdLdagfbPLEet4-v83*{sLvz~STf`;NBRd>L;4cp$LQ{!-VSx;*&1qw8PumE>R=3}pc=JO#I~p!>AYv79syXt1JISR z-oE~x<_Hg9_n|(YY7QIRxM>nu1N=R~&Hd+yuAE{p5G^9{vnJ$dfHv19>qAs-93NES(!WS8u+5H^pI#5{-W_Ig~-J=vBl*68%eZigf?maJ^@ zT4_TgLv2%yp;1LumC-Rp^(Hoh(P*$f8cpdKlDN_~tF>t%wEhmpGIWut@Q$tXB%=eDH71m+nVSy T@M#Zi5mKj#cG0k$@uu(>zS7LG delta 508 zcmX@%a>A*efsuiMftR6yftew|%`L?Dxk2Iz1_nhPps0+yi>n($1p^z9&jaKu_y_A7 zH73h_W?*290P+)(a}x_>`h)!$7?_>_#SWz>78m^g4>XBEkp(Evk)BhTHqX6qDgy(n z0|SHjo{ZGQ6jqME`aromKx~$gky@X~?#{dzs96LkppubWQgN~V{{Q{ z|8b6wfq@0+D25rii4_G5lNnrrauz_oLSABS>I!+LZ9upFVPIf(D#$M`$&t)C3zTvI z${zuH4(P$pdyk04^V@u7;AVaS6lb__^3GBS&2(q!Bt~WFn=IvEwID$l@CJ)`Pqt%} zWxT&QhLLe{3e#)GsL27$%7W+rpZkCI|C#@%|DXDQ@&OA2<77h?waKfPW7HWKG_|yK zboChY84L`Kj7=C!&CD$$Mud| zh1-nVgL@kHG46ZZ_cr^m>T+++6fEFnG?{!$u8`4WvyZ$W6QlR!IK|+}TNQH{y(TLu LDY0BQnSC1oVh)G5 diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff index 37ef3162571d4b85ed3322ddea7709ce6234ff88..d419defd6b9d7237696f639dd1a1910196e6610a 100644 GIT binary patch delta 6140 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 m4r9`Iq^=-n=&Mv2}#t3-67ts0$0^wpyU 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 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