From 03829af2ad6a8a1a00d1a6920c40de27f984a3a0 Mon Sep 17 00:00:00 2001 From: Deep Tailor Date: Sun, 5 Jan 2020 20:56:53 -0800 Subject: [PATCH 1/9] check if filters are not equal before refetching --- src/plugins/plot/src/configuration/PlotSeries.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/plot/src/configuration/PlotSeries.js b/src/plugins/plot/src/configuration/PlotSeries.js index 390be5dd3a..9ec2459c09 100644 --- a/src/plugins/plot/src/configuration/PlotSeries.js +++ b/src/plugins/plot/src/configuration/PlotSeries.js @@ -377,7 +377,7 @@ define([ * @public */ updateFiltersAndRefresh: function (updatedFilters) { - if (this.filters) { + if (this.filters && !_.isEqual(this.filters, updatedFilters)) { this.filters = updatedFilters; this.reset(); if (this.unsubscribe) { From fa21911287ad145c6e54d4794fbc3ba2d9068610 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Sat, 25 Jan 2020 00:52:36 -0800 Subject: [PATCH 2/9] persist expanded and navigated state of node to local storage --- src/ui/layout/tree-item.vue | 62 +++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/src/ui/layout/tree-item.vue b/src/ui/layout/tree-item.vue index 9122b14bcb..c0248e2821 100644 --- a/src/ui/layout/tree-item.vue +++ b/src/ui/layout/tree-item.vue @@ -2,7 +2,7 @@
  • c.id !== removeId); + this.removeLocalStorageState(makeLocalStorageStateKey(removeId)); }, finishLoading() { this.isLoading = false; @@ -139,10 +154,45 @@ export default { }, highlightIfNavigated(newPath, oldPath) { if (newPath === this.navigateToPath) { - this.isNavigated = true; + this.navigated = true; } else if (oldPath === this.navigateToPath) { - this.isNavigated = false; + this.navigated = false; } + }, + initLocalStorageState() { + this.key = makeLocalStorageStateKey(this.openmct.objects.makeKeyString(this.node.object.identifier)) + this.state = { + expanded: [], + navigated: '' + }; + }, + getLocalStorageState() { + const state = localStorage.getItem(this.key); + + if (state) { + this.state = JSON.parse(state); + console.log(this.state.navigated) + console.log(this.navigateToPath) + this.expanded = this.state.expanded.includes(this.navigateToPath); + this.navigated = this.state.navigated === this.navigateToPath; + } else { + this.setLocalStorageState(); + } + }, + setLocalStorageState() { + this.state.expanded = this.expanded + ? [...new Set([this.navigateToPath, ...this.state.expanded])] + : this.state.expanded.filter(path => path !== this.navigateToPath); + this.state.navigated = this.navigated ? this.navigateToPath : ''; + + if ((this.state.expanded && this.state.expanded.length) || this.state.navigated) { + localStorage.setItem(this.key, JSON.stringify(this.state)); + } else { + this.removeLocalStorageState(this.key); + } + }, + removeLocalStorageState(key) { + localStorage.removeItem(key); } } } From 0fd0da83314886c4f4419d34e87c36f1d5fa5525 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Mon, 27 Jan 2020 01:06:40 -0800 Subject: [PATCH 3/9] rework local storage mechanisms * use one navigated local storage item instead one per node * use one expanded local storage item instead of one per node * fix navigated * collapse children when node collapsed --- src/ui/layout/tree-item.vue | 83 +++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/src/ui/layout/tree-item.vue b/src/ui/layout/tree-item.vue index c0248e2821..071cf91eb4 100644 --- a/src/ui/layout/tree-item.vue +++ b/src/ui/layout/tree-item.vue @@ -40,11 +40,8 @@ import viewControl from '../components/viewControl.vue'; import ObjectLabel from '../components/ObjectLabel.vue'; -const LOCAL_STORAGE__TREE_STATE_ID = 'mct-tree--'; - -function makeLocalStorageStateKey(id) { - return `${LOCAL_STORAGE__TREE_STATE_ID}${id}`; -} +const LOCAL_STORAGE_KEY__TREE_NAVIGATED = 'mct-tree-navigated'; +const LOCAL_STORAGE_KEY__TREE_EXPANDED = 'mct-tree-expanded'; export default { name: 'TreeItem', @@ -92,15 +89,9 @@ export default { this.composition.load().then(this.finishLoading); this.isLoading = true; } - this.setLocalStorageState(); - }, - navigated() { - this.setLocalStorageState(); + this.setLocalStorageExpanded(this.navigateToPath); } }, - beforeMount() { - this.initLocalStorageState(); - }, mounted() { // TODO: should update on mutation. // TODO: click navigation should not fubar hash quite so much. @@ -120,7 +111,18 @@ export default { } this.openmct.router.on('change:path', this.highlightIfNavigated); - this.getLocalStorageState(); + + this.getLocalStorageExpanded(); + this.getLocalStorageNavigated(); + }, + beforeDestroy() { + /**** + * calling this.setLocalStorageExpanded explicitly here because for whatever reason, + * the watcher on this.expanded is not triggering this.setLocalStorageExpanded(), + * even though Vue documentation states, "At this stage the instance is still fully functional." + *****/ + this.expanded = false; + this.setLocalStorageExpanded(); }, destroyed() { this.openmct.router.off('change:path', this.highlightIfNavigated); @@ -143,7 +145,6 @@ export default { let removeId = this.openmct.objects.makeKeyString(identifier); this.children = this.children .filter(c => c.id !== removeId); - this.removeLocalStorageState(makeLocalStorageStateKey(removeId)); }, finishLoading() { this.isLoading = false; @@ -158,41 +159,43 @@ export default { } else if (oldPath === this.navigateToPath) { this.navigated = false; } + this.setLocalStorageNavigated(newPath); }, - initLocalStorageState() { - this.key = makeLocalStorageStateKey(this.openmct.objects.makeKeyString(this.node.object.identifier)) - this.state = { - expanded: [], - navigated: '' - }; + getLocalStorageNavigated() { + const navigated = localStorage.getItem(LOCAL_STORAGE_KEY__TREE_NAVIGATED); + this.navigated = navigated && JSON.parse(navigated) === this.navigateToPath; }, - getLocalStorageState() { - const state = localStorage.getItem(this.key); + setLocalStorageNavigated(path) { + localStorage.setItem(LOCAL_STORAGE_KEY__TREE_NAVIGATED, JSON.stringify(path)); + }, + getLocalStorageExpanded() { + let expandedPaths = localStorage.getItem(LOCAL_STORAGE_KEY__TREE_EXPANDED); - if (state) { - this.state = JSON.parse(state); - console.log(this.state.navigated) - console.log(this.navigateToPath) - this.expanded = this.state.expanded.includes(this.navigateToPath); - this.navigated = this.state.navigated === this.navigateToPath; - } else { - this.setLocalStorageState(); + if (expandedPaths) { + expandedPaths = JSON.parse(expandedPaths); + this.expanded = expandedPaths.includes(this.navigateToPath); } }, - setLocalStorageState() { - this.state.expanded = this.expanded - ? [...new Set([this.navigateToPath, ...this.state.expanded])] - : this.state.expanded.filter(path => path !== this.navigateToPath); - this.state.navigated = this.navigated ? this.navigateToPath : ''; + setLocalStorageExpanded() { + let expandedPaths = localStorage.getItem(LOCAL_STORAGE_KEY__TREE_EXPANDED); + expandedPaths = expandedPaths ? JSON.parse(expandedPaths) : []; - if ((this.state.expanded && this.state.expanded.length) || this.state.navigated) { - localStorage.setItem(this.key, JSON.stringify(this.state)); + if (this.expanded) { + if (!expandedPaths.includes(this.navigateToPath)) { + expandedPaths.push(this.navigateToPath); + } } else { - this.removeLocalStorageState(this.key); + // remove this node path and all children paths from stored expanded paths + expandedPaths = expandedPaths.filter(path => !path.startsWith(this.navigateToPath)); } + + localStorage.setItem(LOCAL_STORAGE_KEY__TREE_EXPANDED, JSON.stringify(expandedPaths)); }, - removeLocalStorageState(key) { - localStorage.removeItem(key); + removeLocalStorageExpanded() { + let expandedPaths = localStorage.getItem(LOCAL_STORAGE_KEY__TREE_EXPANDED); + expandedPaths = expandedPaths ? JSON.parse(expandedPaths) : []; + expandedPaths = expandedPaths.filter(path => !path.startsWith(this.navigateToPath)); + localStorage.setItem(LOCAL_STORAGE_KEY__TREE_EXPANDED, JSON.stringify(expandedPaths)); } } } From 223a0feada812bf160017575ba92bb327f3e6b46 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Mon, 27 Jan 2020 10:17:27 -0800 Subject: [PATCH 4/9] comments to describe localStorage implementation --- src/ui/layout/tree-item.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ui/layout/tree-item.vue b/src/ui/layout/tree-item.vue index 071cf91eb4..beac262219 100644 --- a/src/ui/layout/tree-item.vue +++ b/src/ui/layout/tree-item.vue @@ -165,6 +165,7 @@ export default { const navigated = localStorage.getItem(LOCAL_STORAGE_KEY__TREE_NAVIGATED); this.navigated = navigated && JSON.parse(navigated) === this.navigateToPath; }, + // on path change, store the path string of the new navigated/highlighted path to localstorage setLocalStorageNavigated(path) { localStorage.setItem(LOCAL_STORAGE_KEY__TREE_NAVIGATED, JSON.stringify(path)); }, @@ -176,6 +177,7 @@ export default { this.expanded = expandedPaths.includes(this.navigateToPath); } }, + // expanded nodes/paths are stored in local storage as an array setLocalStorageExpanded() { let expandedPaths = localStorage.getItem(LOCAL_STORAGE_KEY__TREE_EXPANDED); expandedPaths = expandedPaths ? JSON.parse(expandedPaths) : []; From 8f0e773ac18135d45201ff1cd7d8df292c11f1dc Mon Sep 17 00:00:00 2001 From: David Tsay Date: Mon, 27 Jan 2020 13:43:13 -0800 Subject: [PATCH 5/9] remove storing navigated to local storage --- src/ui/layout/tree-item.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/ui/layout/tree-item.vue b/src/ui/layout/tree-item.vue index beac262219..731f608cde 100644 --- a/src/ui/layout/tree-item.vue +++ b/src/ui/layout/tree-item.vue @@ -113,7 +113,6 @@ export default { this.openmct.router.on('change:path', this.highlightIfNavigated); this.getLocalStorageExpanded(); - this.getLocalStorageNavigated(); }, beforeDestroy() { /**** @@ -159,15 +158,6 @@ export default { } else if (oldPath === this.navigateToPath) { this.navigated = false; } - this.setLocalStorageNavigated(newPath); - }, - getLocalStorageNavigated() { - const navigated = localStorage.getItem(LOCAL_STORAGE_KEY__TREE_NAVIGATED); - this.navigated = navigated && JSON.parse(navigated) === this.navigateToPath; - }, - // on path change, store the path string of the new navigated/highlighted path to localstorage - setLocalStorageNavigated(path) { - localStorage.setItem(LOCAL_STORAGE_KEY__TREE_NAVIGATED, JSON.stringify(path)); }, getLocalStorageExpanded() { let expandedPaths = localStorage.getItem(LOCAL_STORAGE_KEY__TREE_EXPANDED); From 2e82edb3060fc04c7246df236b0f2947f0a275ff Mon Sep 17 00:00:00 2001 From: David Tsay Date: Mon, 27 Jan 2020 13:44:56 -0800 Subject: [PATCH 6/9] remove unused var --- src/ui/layout/tree-item.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ui/layout/tree-item.vue b/src/ui/layout/tree-item.vue index 731f608cde..d2fb93d682 100644 --- a/src/ui/layout/tree-item.vue +++ b/src/ui/layout/tree-item.vue @@ -40,7 +40,6 @@ import viewControl from '../components/viewControl.vue'; import ObjectLabel from '../components/ObjectLabel.vue'; -const LOCAL_STORAGE_KEY__TREE_NAVIGATED = 'mct-tree-navigated'; const LOCAL_STORAGE_KEY__TREE_EXPANDED = 'mct-tree-expanded'; export default { From 682601477cb17d270474360913c56daa2a547fb0 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 13 Feb 2020 13:11:24 -0800 Subject: [PATCH 7/9] Add glyphs (#2667) - icon-flag for use with VISTA Frame Accountability; - icon-conditional, and bg-icon-conditional for Conditionals; --- src/styles/_constants.scss | 3 + src/styles/_glyphs.scss | 3 + src/styles/fonts/Open MCT Symbols 16px.json | 226 ++++++++++++-------- src/styles/fonts/Open-MCT-Symbols-16px.svg | 2 + src/styles/fonts/Open-MCT-Symbols-16px.ttf | Bin 20204 -> 20376 bytes src/styles/fonts/Open-MCT-Symbols-16px.woff | Bin 20280 -> 20452 bytes 6 files changed, 144 insertions(+), 90 deletions(-) diff --git a/src/styles/_constants.scss b/src/styles/_constants.scss index 7579817a83..50e7ddb566 100644 --- a/src/styles/_constants.scss +++ b/src/styles/_constants.scss @@ -147,6 +147,7 @@ $glyph-icon-filter: '\e926'; $glyph-icon-filter-outline: '\e927'; $glyph-icon-suitcase: '\e928'; $glyph-icon-cursor-lock: '\e929'; +$glyph-icon-flag: '\e92a'; $glyph-icon-arrows-right-left: '\ea00'; $glyph-icon-arrows-up-down: '\ea01'; $glyph-icon-bullet: '\ea02'; @@ -236,6 +237,7 @@ $glyph-icon-gauge: '\eb23'; $glyph-icon-spectra: '\eb24'; $glyph-icon-spectra-telemetry: '\eb25'; $glyph-icon-command: '\eb26'; +$glyph-icon-conditional: '\eb27'; /************************** GLYPHS AS DATA URI */ // Only objects have been converted, for use in Create menu and folder views @@ -285,3 +287,4 @@ $bg-icon-gauge: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w $bg-icon-spectra: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath fill='%23000000' d='M384 352H128l51.2-89.6L0 288v127c0 53.3 43.7 97 97 97h318c53.4 0 97-43.7 97-97v-31l-162.9-93.1zM415 0H97C43.7 0 0 43.6 0 97v159l200-30.1 56-97.9 54.9 96H512V97a97.2 97.2 0 00-97-97zM512 320v-32l-192-32 192 64z'/%3e%3c/svg%3e"); $bg-icon-spectra-telemetry: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath fill='%23000000' d='M256 128l54.9 96H510C494.3 97.7 386.5 0 256 0 114.6 0 0 114.6 0 256l200-30.1zM384 352H128l51.2-89.6L2 287.7C17.6 414.1 125.4 512 256 512c100.8 0 188-58.3 229.8-143l-136.7-78.1zM320 256l192 64v-32l-192-32z'/%3e%3c/svg%3e"); $bg-icon-command: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath fill='%23000000' d='M185.1 229.7a96.5 96.5 0 0015.8 11.7A68.5 68.5 0 01192 208c0-19.8 8.9-38.8 25.1-53.7 18.5-17 43.7-26.3 70.9-26.3 20.1 0 39.1 5.1 55.1 14.6a81.3 81.3 0 00-16.2-20.3C308.4 105.3 283.2 96 256 96s-52.4 9.3-70.9 26.3C168.9 137.2 160 156.2 160 176s8.9 38.8 25.1 53.7z'/%3e%3cpath d='M442.7 134.8C422.4 57.5 346.5 0 256 0S89.6 57.5 69.3 134.8C26.3 174.8 0 228.7 0 288c0 123.7 114.6 224 256 224s256-100.3 256-224c0-59.3-26.3-113.2-69.3-153.2zM256 64c70.6 0 128 50.2 128 112s-57.4 112-128 112-128-50.2-128-112S185.4 64 256 64zm0 352c-87.7 0-159.2-63.9-160-142.7 34.4 47.4 93.2 78.7 160 78.7s125.6-31.3 160-78.7c-.8 78.8-72.3 142.7-160 142.7z'/%3e%3c/svg%3e"); +$bg-icon-conditional: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath d='M256 0C114.62 0 0 114.62 0 256s114.62 256 256 256 256-114.62 256-256S397.38 0 256 0zm0 384L64 256l192-128 192 128z' fill='%23000000'/%3e%3c/svg%3e"); diff --git a/src/styles/_glyphs.scss b/src/styles/_glyphs.scss index 838d1bd04f..ec4782605e 100644 --- a/src/styles/_glyphs.scss +++ b/src/styles/_glyphs.scss @@ -81,6 +81,7 @@ .icon-filter-outline { @include glyphBefore($glyph-icon-filter-outline); } .icon-suitcase { @include glyphBefore($glyph-icon-suitcase); } .icon-cursor-lock { @include glyphBefore($glyph-icon-cursor-lock); } +.icon-flag { @include glyphBefore($glyph-icon-flag); } .icon-arrows-right-left { @include glyphBefore($glyph-icon-arrows-right-left); } .icon-arrows-up-down { @include glyphBefore($glyph-icon-arrows-up-down); } .icon-bullet { @include glyphBefore($glyph-icon-bullet); } @@ -170,6 +171,7 @@ .icon-spectra { @include glyphBefore($glyph-icon-spectra); } .icon-spectra-telemetry { @include glyphBefore($glyph-icon-spectra-telemetry); } .icon-command { @include glyphBefore($glyph-icon-command); } +.icon-conditional { @include glyphBefore($glyph-icon-conditional); } /************************** 12 PX CLASSES */ // TODO: sync with 16px redo as of 10/25/18 @@ -227,3 +229,4 @@ .bg-icon-spectra { @include glyphBg($bg-icon-spectra); } .bg-icon-spectra-telemetry { @include glyphBg($bg-icon-spectra-telemetry); } .bg-icon-command { @include glyphBg($bg-icon-command); } +.bg-icon-conditional { @include glyphBg($bg-icon-conditional); } diff --git a/src/styles/fonts/Open MCT Symbols 16px.json b/src/styles/fonts/Open MCT Symbols 16px.json index 6ee3ec911f..99bfe9278c 100644 --- a/src/styles/fonts/Open MCT Symbols 16px.json +++ b/src/styles/fonts/Open MCT Symbols 16px.json @@ -2,7 +2,7 @@ "metadata": { "name": "Open MCT Symbols 16px", "lastOpened": 0, - "created": 1574106570211 + "created": 1581619121103 }, "iconSets": [ { @@ -343,13 +343,21 @@ "code": 59689, "tempChar": "" }, + { + "order": 176, + "id": 150, + "name": "icon-flag", + "prevSize": 24, + "code": 59690, + "tempChar": "" + }, { "order": 27, "id": 105, "name": "icon-arrows-right-left", "prevSize": 24, "code": 59904, - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -357,7 +365,7 @@ "name": "icon-arrows-up-down", "prevSize": 24, "code": 59905, - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -365,7 +373,7 @@ "name": "icon-bullet", "prevSize": 24, "code": 59906, - "tempChar": "" + "tempChar": "" }, { "order": 150, @@ -373,7 +381,7 @@ "prevSize": 24, "code": 59907, "name": "icon-calendar", - "tempChar": "" + "tempChar": "" }, { "order": 45, @@ -381,7 +389,7 @@ "name": "icon-chain-links", "prevSize": 24, "code": 59908, - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -389,7 +397,7 @@ "name": "icon-download", "prevSize": 24, "code": 59909, - "tempChar": "" + "tempChar": "" }, { "order": 39, @@ -397,7 +405,7 @@ "name": "icon-duplicate", "prevSize": 24, "code": 59910, - "tempChar": "" + "tempChar": "" }, { "order": 50, @@ -405,7 +413,7 @@ "name": "icon-folder-new", "prevSize": 24, "code": 59911, - "tempChar": "" + "tempChar": "" }, { "order": 138, @@ -413,7 +421,7 @@ "name": "icon-fullscreen-collapse", "prevSize": 24, "code": 59912, - "tempChar": "" + "tempChar": "" }, { "order": 139, @@ -421,7 +429,7 @@ "name": "icon-fullscreen-expand", "prevSize": 24, "code": 59913, - "tempChar": "" + "tempChar": "" }, { "order": 122, @@ -429,7 +437,7 @@ "name": "icon-layers", "prevSize": 24, "code": 59914, - "tempChar": "" + "tempChar": "" }, { "order": 151, @@ -437,7 +445,7 @@ "name": "icon-line-horz", "prevSize": 24, "code": 59915, - "tempChar": "" + "tempChar": "" }, { "order": 100, @@ -445,7 +453,7 @@ "name": "icon-magnify", "prevSize": 24, "code": 59916, - "tempChar": "" + "tempChar": "" }, { "order": 99, @@ -453,7 +461,7 @@ "name": "icon-magnify-in", "prevSize": 24, "code": 59917, - "tempChar": "" + "tempChar": "" }, { "order": 101, @@ -461,7 +469,7 @@ "name": "icon-magnify-out-v2", "prevSize": 24, "code": 59918, - "tempChar": "" + "tempChar": "" }, { "order": 103, @@ -469,7 +477,7 @@ "name": "icon-menu", "prevSize": 24, "code": 59919, - "tempChar": "" + "tempChar": "" }, { "order": 124, @@ -477,7 +485,7 @@ "name": "icon-move", "prevSize": 24, "code": 59920, - "tempChar": "" + "tempChar": "" }, { "order": 7, @@ -485,7 +493,7 @@ "name": "icon-new-window", "prevSize": 24, "code": 59921, - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -493,7 +501,7 @@ "name": "icon-paint-bucket-v2", "prevSize": 24, "code": 59922, - "tempChar": "" + "tempChar": "" }, { "order": 15, @@ -501,7 +509,7 @@ "name": "icon-pencil", "prevSize": 24, "code": 59923, - "tempChar": "" + "tempChar": "" }, { "order": 54, @@ -509,7 +517,7 @@ "name": "icon-pencil-edit-in-place", "prevSize": 24, "code": 59924, - "tempChar": "" + "tempChar": "" }, { "order": 40, @@ -517,7 +525,7 @@ "name": "icon-play", "prevSize": 24, "code": 59925, - "tempChar": "" + "tempChar": "" }, { "order": 125, @@ -525,7 +533,7 @@ "name": "icon-pause", "prevSize": 24, "code": 59926, - "tempChar": "" + "tempChar": "" }, { "order": 119, @@ -533,7 +541,7 @@ "name": "icon-plot-resource", "prevSize": 24, "code": 59927, - "tempChar": "" + "tempChar": "" }, { "order": 48, @@ -541,7 +549,7 @@ "name": "icon-pointer-left", "prevSize": 24, "code": 59928, - "tempChar": "" + "tempChar": "" }, { "order": 47, @@ -549,7 +557,7 @@ "name": "icon-pointer-right", "prevSize": 24, "code": 59929, - "tempChar": "" + "tempChar": "" }, { "order": 85, @@ -557,7 +565,7 @@ "name": "icon-refresh", "prevSize": 24, "code": 59930, - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -565,7 +573,7 @@ "name": "icon-save", "prevSize": 24, "code": 59931, - "tempChar": "" + "tempChar": "" }, { "order": 56, @@ -573,7 +581,7 @@ "name": "icon-save-as", "prevSize": 24, "code": 59932, - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -581,7 +589,7 @@ "name": "icon-sine", "prevSize": 24, "code": 59933, - "tempChar": "" + "tempChar": "" }, { "order": 113, @@ -589,7 +597,7 @@ "name": "icon-font", "prevSize": 24, "code": 59934, - "tempChar": "" + "tempChar": "" }, { "order": 41, @@ -597,7 +605,7 @@ "name": "icon-thumbs-strip", "prevSize": 24, "code": 59935, - "tempChar": "" + "tempChar": "" }, { "order": 146, @@ -605,7 +613,7 @@ "name": "icon-two-parts-both", "prevSize": 24, "code": 59936, - "tempChar": "" + "tempChar": "" }, { "order": 145, @@ -613,7 +621,7 @@ "name": "icon-two-parts-one-only", "prevSize": 24, "code": 59937, - "tempChar": "" + "tempChar": "" }, { "order": 82, @@ -621,7 +629,7 @@ "name": "icon-resync", "prevSize": 24, "code": 59938, - "tempChar": "" + "tempChar": "" }, { "order": 86, @@ -629,7 +637,7 @@ "name": "icon-reset", "prevSize": 24, "code": 59939, - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -637,7 +645,7 @@ "name": "icon-x-in-circle", "prevSize": 24, "code": 59940, - "tempChar": "" + "tempChar": "" }, { "order": 84, @@ -645,7 +653,7 @@ "name": "icon-brightness", "prevSize": 24, "code": 59941, - "tempChar": "" + "tempChar": "" }, { "order": 83, @@ -653,7 +661,7 @@ "name": "icon-contrast", "prevSize": 24, "code": 59942, - "tempChar": "" + "tempChar": "" }, { "order": 87, @@ -661,7 +669,7 @@ "name": "icon-expand", "prevSize": 24, "code": 59943, - "tempChar": "" + "tempChar": "" }, { "order": 89, @@ -669,7 +677,7 @@ "name": "icon-list-view", "prevSize": 24, "code": 59944, - "tempChar": "" + "tempChar": "" }, { "order": 133, @@ -677,7 +685,7 @@ "name": "icon-grid-snap-to", "prevSize": 24, "code": 59945, - "tempChar": "" + "tempChar": "" }, { "order": 132, @@ -685,7 +693,7 @@ "name": "icon-grid-snap-no", "prevSize": 24, "code": 59946, - "tempChar": "" + "tempChar": "" }, { "order": 94, @@ -693,7 +701,7 @@ "name": "icon-frame-show", "prevSize": 24, "code": 59947, - "tempChar": "" + "tempChar": "" }, { "order": 95, @@ -701,7 +709,7 @@ "name": "icon-frame-hide", "prevSize": 24, "code": 59948, - "tempChar": "" + "tempChar": "" }, { "order": 97, @@ -709,7 +717,7 @@ "name": "icon-import", "prevSize": 24, "code": 59949, - "tempChar": "" + "tempChar": "" }, { "order": 96, @@ -717,7 +725,7 @@ "name": "icon-export", "prevSize": 24, "code": 59950, - "tempChar": "" + "tempChar": "" }, { "order": 114, @@ -725,7 +733,7 @@ "name": "icon-font-size", "prevSize": 24, "code": 59951, - "tempChar": "" + "tempChar": "" }, { "order": 163, @@ -733,7 +741,7 @@ "name": "icon-clear-data", "prevSize": 24, "code": 59952, - "tempChar": "" + "tempChar": "" }, { "order": 173, @@ -741,7 +749,7 @@ "name": "icon-history", "prevSize": 24, "code": 59953, - "tempChar": "" + "tempChar": "" }, { "order": 144, @@ -749,7 +757,7 @@ "name": "icon-activity", "prevSize": 24, "code": 60160, - "tempChar": "" + "tempChar": "" }, { "order": 104, @@ -757,7 +765,7 @@ "name": "icon-activity-mode", "prevSize": 24, "code": 60161, - "tempChar": "" + "tempChar": "" }, { "order": 137, @@ -765,7 +773,7 @@ "name": "icon-autoflow-tabular", "prevSize": 24, "code": 60162, - "tempChar": "" + "tempChar": "" }, { "order": 115, @@ -773,7 +781,7 @@ "name": "icon-clock", "prevSize": 24, "code": 60163, - "tempChar": "" + "tempChar": "" }, { "order": 2, @@ -781,7 +789,7 @@ "name": "icon-database", "prevSize": 24, "code": 60164, - "tempChar": "" + "tempChar": "" }, { "order": 3, @@ -789,7 +797,7 @@ "name": "icon-database-query", "prevSize": 24, "code": 60165, - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -797,7 +805,7 @@ "name": "icon-dataset", "prevSize": 24, "code": 60166, - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -805,7 +813,7 @@ "name": "icon-datatable", "prevSize": 24, "code": 60167, - "tempChar": "" + "tempChar": "" }, { "order": 136, @@ -813,7 +821,7 @@ "name": "icon-dictionary", "prevSize": 24, "code": 60168, - "tempChar": "" + "tempChar": "" }, { "order": 51, @@ -821,7 +829,7 @@ "name": "icon-folder", "prevSize": 24, "code": 60169, - "tempChar": "" + "tempChar": "" }, { "order": 147, @@ -829,7 +837,7 @@ "name": "icon-image", "prevSize": 24, "code": 60170, - "tempChar": "" + "tempChar": "" }, { "order": 4, @@ -837,7 +845,7 @@ "name": "icon-layout", "prevSize": 24, "code": 60171, - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -845,7 +853,7 @@ "name": "icon-object", "prevSize": 24, "code": 60172, - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -853,7 +861,7 @@ "name": "icon-object-unknown", "prevSize": 24, "code": 60173, - "tempChar": "" + "tempChar": "" }, { "order": 105, @@ -861,7 +869,7 @@ "name": "icon-packet", "prevSize": 24, "code": 60174, - "tempChar": "" + "tempChar": "" }, { "order": 126, @@ -869,7 +877,7 @@ "name": "icon-page", "prevSize": 24, "code": 60175, - "tempChar": "" + "tempChar": "" }, { "order": 130, @@ -877,7 +885,7 @@ "name": "icon-plot-overlay", "prevSize": 24, "code": 60176, - "tempChar": "" + "tempChar": "" }, { "order": 80, @@ -885,7 +893,7 @@ "name": "icon-plot-stacked", "prevSize": 24, "code": 60177, - "tempChar": "" + "tempChar": "" }, { "order": 134, @@ -893,7 +901,7 @@ "name": "icon-session", "prevSize": 24, "code": 60178, - "tempChar": "" + "tempChar": "" }, { "order": 109, @@ -901,7 +909,7 @@ "name": "icon-tabular", "prevSize": 24, "code": 60179, - "tempChar": "" + "tempChar": "" }, { "order": 107, @@ -909,7 +917,7 @@ "name": "icon-tabular-lad", "prevSize": 24, "code": 60180, - "tempChar": "" + "tempChar": "" }, { "order": 106, @@ -917,7 +925,7 @@ "name": "icon-tabular-lad-set", "prevSize": 24, "code": 60181, - "tempChar": "" + "tempChar": "" }, { "order": 70, @@ -925,7 +933,7 @@ "name": "icon-tabular-realtime", "prevSize": 24, "code": 60182, - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -933,7 +941,7 @@ "name": "icon-tabular-scrolling", "prevSize": 24, "code": 60183, - "tempChar": "" + "tempChar": "" }, { "order": 131, @@ -941,7 +949,7 @@ "name": "icon-telemetry", "prevSize": 24, "code": 60184, - "tempChar": "" + "tempChar": "" }, { "order": 108, @@ -949,7 +957,7 @@ "name": "icon-timeline", "prevSize": 24, "code": 60185, - "tempChar": "" + "tempChar": "" }, { "order": 81, @@ -957,7 +965,7 @@ "name": "icon-timer", "prevSize": 24, "code": 60186, - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -965,7 +973,7 @@ "name": "icon-topic", "prevSize": 24, "code": 60187, - "tempChar": "" + "tempChar": "" }, { "order": 79, @@ -973,7 +981,7 @@ "name": "icon-box-with-dashed-lines-v2", "prevSize": 24, "code": 60188, - "tempChar": "" + "tempChar": "" }, { "order": 90, @@ -981,7 +989,7 @@ "name": "icon-summary-widget", "prevSize": 24, "code": 60189, - "tempChar": "" + "tempChar": "" }, { "order": 92, @@ -989,7 +997,7 @@ "name": "icon-notebook", "prevSize": 24, "code": 60190, - "tempChar": "" + "tempChar": "" }, { "order": 168, @@ -997,7 +1005,7 @@ "name": "icon-tabs-view", "prevSize": 24, "code": 60191, - "tempChar": "" + "tempChar": "" }, { "order": 117, @@ -1005,7 +1013,7 @@ "name": "icon-flexible-layout", "prevSize": 24, "code": 60192, - "tempChar": "" + "tempChar": "" }, { "order": 166, @@ -1013,7 +1021,7 @@ "name": "icon-generator-sine", "prevSize": 24, "code": 60193, - "tempChar": "" + "tempChar": "" }, { "order": 167, @@ -1021,7 +1029,7 @@ "name": "icon-generator-event", "prevSize": 24, "code": 60194, - "tempChar": "" + "tempChar": "" }, { "order": 165, @@ -1029,7 +1037,7 @@ "name": "icon-gauge-v2", "prevSize": 24, "code": 60195, - "tempChar": "" + "tempChar": "" }, { "order": 170, @@ -1037,7 +1045,7 @@ "name": "icon-spectra", "prevSize": 24, "code": 60196, - "tempChar": "" + "tempChar": "" }, { "order": 171, @@ -1045,7 +1053,7 @@ "name": "icon-telemetry-spectra", "prevSize": 24, "code": 60197, - "tempChar": "" + "tempChar": "" }, { "order": 172, @@ -1053,7 +1061,15 @@ "name": "icon-pushbutton", "prevSize": 24, "code": 60198, - "tempChar": "" + "tempChar": "" + }, + { + "order": 174, + "id": 151, + "name": "icon-conditional", + "prevSize": 24, + "code": 60199, + "tempChar": "" } ], "id": 0, @@ -1613,6 +1629,21 @@ "icon-cursor-locked" ] }, + { + "id": 150, + "paths": [ + "M192 640h832l-192-320 192-320h-896c-70.606 0.215-127.785 57.394-128 127.979l-0 0.021v896h192z" + ], + "attrs": [ + {} + ], + "grid": 16, + "tags": [ + "icon-flag" + ], + "isMulticolor": false, + "isMulticolor2": false + }, { "id": 105, "paths": [ @@ -2771,6 +2802,21 @@ "tags": [ "icon-pushbutton" ] + }, + { + "id": 151, + "paths": [ + "M512 0c-282.76 0-512 229.24-512 512s229.24 512 512 512 512-229.24 512-512-229.24-512-512-512zM512 768l-384-256 384-256 384 256z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-conditional" + ] } ], "invisible": false, diff --git a/src/styles/fonts/Open-MCT-Symbols-16px.svg b/src/styles/fonts/Open-MCT-Symbols-16px.svg index 58e00bbe57..a7376766a3 100755 --- a/src/styles/fonts/Open-MCT-Symbols-16px.svg +++ b/src/styles/fonts/Open-MCT-Symbols-16px.svg @@ -49,6 +49,7 @@ + @@ -138,4 +139,5 @@ + \ No newline at end of file diff --git a/src/styles/fonts/Open-MCT-Symbols-16px.ttf b/src/styles/fonts/Open-MCT-Symbols-16px.ttf index def5bb025c94d2768bb0c460acae671416989dc9..cd0ed6df5493639b8d1cf3474b1253254509fbb3 100755 GIT binary patch delta 581 zcmaDemvP2?#(D-u1_lOhh6V;^1_S?KeIx$4>}EibJwTk0oSRs{@NT~}0|TQBke`yC zSX=<41%UhpAkC4UQ<=t`^fVpF?_gl?;K@i$OcDRdWX!An>o4xWk=MeG;QLtJW*S*Xol47^Ru@MH4sYG4=~;1O4>h zfrWwDfq|2O!CaA9SW$^hRM7YUv%`S{e;Q1^4;)~0V07>{{nNm(`H#>~Q(h*x25AQQ z$$6@BEXi6@I1Vk-z%1Jk{8S59Pgxhjz63doON6VToGJTxE^pzaffgh zarbb);ECbc$8&?1gV%v~7VkMe2|hJG8@_3LYxoZFoAB51KNH9i=n!}&C?semI6;U> z$VKRnu#502;ZwqYL`*~iL~2AaEOZ1XWODM8EfYTmF->D&@Xi4mB9NO{QNS>jVIBj6PYqCmLSABS zs^at6Z-D$cKn;2Y`NbtbhXR4$nTb2x8Pz5+db4W2GJLHzIe<}`Sx+=!a~@;A;ATzX zAEwG6kFiS5ioCSVKAzv^D+4zRNF&3|A1hj5^yD3$=8Wx=KX@MAyxl93ak7X{QavXV zX9kxPmlIbV*C}omZaeN6?lSI6JZ?NIcnhjfll77PBWEIaLta6?NP$Bk iNnw`45rsdBCW;4?7?cu})+v2a-Ug1p_RV^}Sxf-!D}I## diff --git a/src/styles/fonts/Open-MCT-Symbols-16px.woff b/src/styles/fonts/Open-MCT-Symbols-16px.woff index 41b7118c1220181e4dd0be443c900b2f289a0ee6..f098f9a88686704f3c688a5500d7eebf213c84ad 100755 GIT binary patch delta 605 zcmdlnkMYTTMu~ENH#Y`G1|aZ%!oUrtXE3lbFiuwV7n!IdTyK_~n^?fWz?cD)N&(|{ z`=!$pi$P*%fP4-p7D&&jOaqEtVPNp!0b%B(r|B7~i9kJ`4}faSKv?`IlW_)6kb%KV z0?1bZVRlpIy&1VB6+kf?1_mae7?X-PJICpq{A8dyJD&ugp&}s6Z6T|Zn^*y~*tZ0z zQ2~snGtA3N%uNM~O#y1u17XGIv)>ft7X#J!ADQ^apHY3X52H7$)+@u;>XYX%N;B(= zCT`xv*e|FJ^!0xS76xVq22KVBb46xhMI|;-LE{6=4hIhWX)yIZaDdT)(ZSpFPXohd z585Is4?)10w$@*K~@o1?vA87DV*u}t3Kom9{9hf{*Hj>~{6 zf@=!b18ynq5bh%G9_|-BF+BTtZt!yOI`GcoJ;x`(r^aW)H;r!%-ywbz{yP3=0yzR5 z0?!161kD5|2r&t{2>lUu5nd&HO8Ae6iAaD*jmQd-3nKqS^F(in{u6T(%Mp7a?j*iR zf=yzA#6F2Xk~)$Rl4X)#q%6gx9HbseSINl8G|9Y?O_CFm^OAcfZzkWNAg55FutDLL fqL8AO;x#2Pr81=>%3R84RM^1Y?c99MCyNOH&0m>5 delta 504 zcmaDdpK-@LMu~ENH#Y`G1|aaaVBiMPes36985k#D^cS9}EmCiqoSRs{z`&RRlt}^O zxBDg16N^D&XMlVTC>BW1sZ0ZkU14Bw&jDeDmVz}Isfj>6o(@1YW*{ssyiPF#CRsb#bIRVtD z0LD`p=H(^krUJ!Y05$4?u;TOCZwm5@OMpI-nE1z^QEjphqc^MOE5p}nljkr>GwX>a zY~ID#FSxl>_=l-7$m^_~9Qd~}4bzG;oS-9=EW4Oz>FY&nXtl&As^NClBw}p2H9}}MdpBi5S z-!#58{Brym{1*hm1d0SM2>cOL5Udh>BcvzvOju8NitrZUXCiVURw8L4lSFojybz5L zJtF!-%s?zm?2@>S_#E*M5>*l_B%Vo%Njga;NZylTkTTVhIwPGT!zPm>b4}Jq_K%#2 s+zojJ`62}lg(QVp3P%+FD4Hl9P-0L@P+F(-MR^-IhTAt+`DQTz0LJWt-~a#s From a0b7999ea2c25b8e2fdd4fcd0d3751b365851a4a Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 25 Feb 2020 11:47:27 -0800 Subject: [PATCH 8/9] Imagery fixes (#2668) * Fix imagery-related styles and markup - VERY WIP!!! - Style modernizing; - Also, padding fixes for pane.scss - unit test for regressions! * Fix imagery-related styles and markup - VERY WIP!!! - Style modernizing WIP; - Fixes to pane classes for better padding in vertical panes; * Fix imagery-related styles and markup - Migrated all imagery CSS into imagery-view-layout.scss from _legacy .scss; - CSS cleanups; - Refactoring/simplification of thumb layout; - Color fixed for $colorPausedFg in theme constants; * Scroll to right instead of bottom, on autoscroll. * Fix imagery-related styles and markup - Make the most recent thumb visually distinct; - Clicking a selected thumb now deselects it and unpauses the view; * Imagery fixes - Fixed thumb click logic to properly toggle paused when clicking a selected thumb; - Improved CSS so that `selected` updates more quickly when selecting the latest thumb; - Clicking the main image pause button now selects the proper thumb; * Fix linting errors Co-authored-by: Nikhil --- .../imagery/components/ImageryViewLayout.vue | 161 ++++++------ .../components/imagery-view-layout.scss | 153 +++++++++++- src/styles/_constants-espresso.scss | 2 +- src/styles/_constants-maelstrom.scss | 2 +- src/styles/_legacy.scss | 230 ------------------ src/ui/layout/pane.scss | 9 +- 6 files changed, 226 insertions(+), 331 deletions(-) diff --git a/src/plugins/imagery/components/ImageryViewLayout.vue b/src/plugins/imagery/components/ImageryViewLayout.vue index 9a08fb91e9..c308e4c366 100644 --- a/src/plugins/imagery/components/ImageryViewLayout.vue +++ b/src/plugins/imagery/components/ImageryViewLayout.vue @@ -1,90 +1,68 @@ diff --git a/src/ui/components/toggle-switch.scss b/src/ui/components/toggle-switch.scss index 045cd827fa..20ca28a648 100644 --- a/src/ui/components/toggle-switch.scss +++ b/src/ui/components/toggle-switch.scss @@ -2,15 +2,40 @@ $d: 12px; $m: 2px; $br: $d/1.5; - cursor: pointer; - overflow: hidden; - display: inline; + display: inline-flex; + align-items: center; vertical-align: middle; + &__control, + &__label { + flex: 0 0 auto; + } + + &__control { + cursor: pointer; + overflow: hidden; + display: block; + } + + input { + opacity: 0; + width: 0; + height: 0; + + &:checked { + + .c-toggle-switch__slider { + background: $colorKey; // TODO: make discrete theme constants for these colors + &:before { + transform: translateX(100%); + } + } + } + } + &__slider { + // Sits within __switch background: $colorBtnBg; // TODO: make discrete theme constants for these colors border-radius: $br; - //box-shadow: inset rgba($colorBtnFg, 0.4) 0 0 0 1px; display: inline-block; height: $d + ($m*2); position: relative; @@ -31,18 +56,9 @@ } } - input { - opacity: 0; - width: 0; - height: 0; - - &:checked { - + .c-toggle-switch__slider { - background: $colorKey; // TODO: make discrete theme constants for these colors - &:before { - transform: translateX(100%); - } - } - } + &__label { + margin-left: $interiorMarginSm; + margin-right: $interiorMargin; + white-space: nowrap; } }