From c0ce448dc3e0e1d3ce558cda598ce62c790bcce4 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 26 Mar 2019 11:38:38 -0700 Subject: [PATCH] Misc UI 5 (#2332) * Style fixes for Inspector and location elements - Code cleanup; - Remove legacy styles; * Tab styling WIP, for VISTA Venue dialog * Add new c-tabs styles, replaces c-compact-button - Remove c-compact-button and mixin; - Refactor to use c-tabs in Tabs View; - New notched look for tabs; * Tweaks to c-tabs * Misc various - Increased mouse wheel zoom and changed to use const; - Fixed squishy grippys in Elements pool; - Fixed Time Conductor to prevent overrunning right pane when main pane is very small; - Changed message text when leaving Layout editing; - Fixed z-index problem with splitter bars and VISTA Indicator hover bubbles; - Restored support for legacy `l-input-lg` to allow large text input fields in form generation; - Modded styles in Properties dialog to fix issue with label column colliding with inputs when the label text is long; * Restore hover hide/show to local controls in Summary Widgets - Also fixed rotation transition for disclosure controls; * Refinement to overflow hidden for Time Conductor UI * Fix Time Conductor layout in mobile * Fix Filter tree items in Inspector * Move .selector-list out from within .form .form-row to allow more flexible usage; * Significant theme updates; table layout and Summary styling added - Reorganized status constants; - Added base styles for selected and active styles; - Added styling for selected and active buttons; - c-table changed from absolute pos to relative; - Added c-table-and-summary styling; * Tweaks to Location component --- .../filters/components/FilterObject.vue | 6 +- .../plot/src/plot/MCTPlotController.js | 17 +- .../summaryWidget/res/conditionTemplate.html | 2 +- .../summaryWidget/res/ruleTemplate.html | 4 +- .../res/testDataItemTemplate.html | 2 +- src/plugins/tabs/components/tabs.vue | 13 +- src/plugins/timeConductor/Conductor.vue | 184 ++++++++++-------- src/styles-new/_constants-espresso.scss | 43 ++-- src/styles-new/_constants-maelstrom.scss | 45 +++-- src/styles-new/_constants-snow.scss | 45 +++-- src/styles-new/_controls.scss | 72 ++++++- src/styles-new/_forms.scss | 38 ++-- src/styles-new/_legacy.scss | 12 +- src/styles-new/_mixins.scss | 44 ----- src/styles-new/_table.scss | 38 +++- src/ui/inspector/Elements.vue | 1 + src/ui/inspector/Inspector.vue | 52 +---- src/ui/inspector/Location.vue | 48 ++++- src/ui/layout/BrowseBar.vue | 2 +- src/ui/layout/Layout.vue | 1 - src/ui/layout/pane.vue | 1 - 21 files changed, 382 insertions(+), 288 deletions(-) diff --git a/src/plugins/filters/components/FilterObject.vue b/src/plugins/filters/components/FilterObject.vue index 5d3eb281fb..fd1bb1ca4e 100644 --- a/src/plugins/filters/components/FilterObject.vue +++ b/src/plugins/filters/components/FilterObject.vue @@ -5,11 +5,11 @@
-
-
+
-
{{ filterObject.name }}
+
{{ filterObject.name }}
diff --git a/src/plugins/plot/src/plot/MCTPlotController.js b/src/plugins/plot/src/plot/MCTPlotController.js index 5e6e7155f2..a6c403df3c 100644 --- a/src/plugins/plot/src/plot/MCTPlotController.js +++ b/src/plugins/plot/src/plot/MCTPlotController.js @@ -315,6 +315,7 @@ define([ }; MCTPlotController.prototype.wheelZoom = function (event) { + const ZOOM_AMT = 0.1; event.preventDefault(); if (!this.positionOverPlot) { @@ -349,24 +350,24 @@ define([ if (event.wheelDelta < 0) { this.$scope.xAxis.set('displayRange', { - min: xDisplayRange.min + ((xAxisDist * 0.01) * xAxisMinDist), - max: xDisplayRange.max - ((xAxisDist * 0.01) * xAxisMaxDist) + min: xDisplayRange.min + ((xAxisDist * ZOOM_AMT) * xAxisMinDist), + max: xDisplayRange.max - ((xAxisDist * ZOOM_AMT) * xAxisMaxDist) }); this.$scope.yAxis.set('displayRange', { - min: yDisplayRange.min + ((yAxisDist * 0.01) * yAxisMinDist), - max: yDisplayRange.max - ((yAxisDist * 0.01) * yAxisMaxDist) + min: yDisplayRange.min + ((yAxisDist * ZOOM_AMT) * yAxisMinDist), + max: yDisplayRange.max - ((yAxisDist * ZOOM_AMT) * yAxisMaxDist) }); } else if (event.wheelDelta >= 0) { this.$scope.xAxis.set('displayRange', { - min: xDisplayRange.min - ((xAxisDist * 0.01) * xAxisMinDist), - max: xDisplayRange.max + ((xAxisDist * 0.01) * xAxisMaxDist) + min: xDisplayRange.min - ((xAxisDist * ZOOM_AMT) * xAxisMinDist), + max: xDisplayRange.max + ((xAxisDist * ZOOM_AMT) * xAxisMaxDist) }); this.$scope.yAxis.set('displayRange', { - min: yDisplayRange.min - ((yAxisDist * 0.01) * yAxisMinDist), - max: yDisplayRange.max + ((yAxisDist * 0.01) * yAxisMaxDist) + min: yDisplayRange.min - ((yAxisDist * ZOOM_AMT) * yAxisMinDist), + max: yDisplayRange.max + ((yAxisDist * ZOOM_AMT) * yAxisMaxDist) }); } diff --git a/src/plugins/summaryWidget/res/conditionTemplate.html b/src/plugins/summaryWidget/res/conditionTemplate.html index 9cd30115ad..ac5af862e6 100644 --- a/src/plugins/summaryWidget/res/conditionTemplate.html +++ b/src/plugins/summaryWidget/res/conditionTemplate.html @@ -4,7 +4,7 @@ - + diff --git a/src/plugins/summaryWidget/res/ruleTemplate.html b/src/plugins/summaryWidget/res/ruleTemplate.html index 0780251ed9..c05276a63d 100644 --- a/src/plugins/summaryWidget/res/ruleTemplate.html +++ b/src/plugins/summaryWidget/res/ruleTemplate.html @@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
Default Title
Rule description goes here
-
+
diff --git a/src/plugins/summaryWidget/res/testDataItemTemplate.html b/src/plugins/summaryWidget/res/testDataItemTemplate.html index 6afff4f5d2..b9b0ef2a87 100644 --- a/src/plugins/summaryWidget/res/testDataItemTemplate.html +++ b/src/plugins/summaryWidget/res/testDataItemTemplate.html @@ -7,7 +7,7 @@ - + diff --git a/src/plugins/tabs/components/tabs.vue b/src/plugins/tabs/components/tabs.vue index d94c7a1077..eca7fe0106 100644 --- a/src/plugins/tabs/components/tabs.vue +++ b/src/plugins/tabs/components/tabs.vue @@ -1,6 +1,6 @@ -