From 95457a198163b3453ce8284cf7136a3f1a20880e Mon Sep 17 00:00:00 2001 From: charlesh88 Date: Tue, 3 Jul 2018 14:25:39 -0700 Subject: [PATCH] View control fixes Fixes #2094 - Add position: relative to .view-control main class; - Add correct classes to markup; - Fix Sum Widget field size while I was in there; --- platform/commonUI/general/res/sass/controls/_controls.scss | 1 + platform/features/notebook/res/templates/notebook.html | 2 +- src/plugins/summaryWidget/res/conditionTemplate.html | 2 +- src/plugins/summaryWidget/res/ruleTemplate.html | 4 ++-- src/plugins/summaryWidget/res/testDataItemTemplate.html | 2 +- src/plugins/summaryWidget/src/Condition.js | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 7e0d7dd843..8d6779ffda 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -211,6 +211,7 @@ body.desktop .has-local-controls { cursor: pointer; height: 1em; width: 1em; line-height: inherit; + position: relative; &:before { position: absolute; @include trans-prop-nice(transform, 100ms); diff --git a/platform/features/notebook/res/templates/notebook.html b/platform/features/notebook/res/templates/notebook.html index 470ff32c1e..53cb8ed4b3 100644 --- a/platform/features/notebook/res/templates/notebook.html +++ b/platform/features/notebook/res/templates/notebook.html @@ -109,7 +109,7 @@ -
+
diff --git a/src/plugins/summaryWidget/res/conditionTemplate.html b/src/plugins/summaryWidget/res/conditionTemplate.html index 51488ae287..9cd30115ad 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 217db4c76b..089f8f8b1b 100644 --- a/src/plugins/summaryWidget/res/ruleTemplate.html +++ b/src/plugins/summaryWidget/res/ruleTemplate.html @@ -3,7 +3,7 @@
- + @@ -12,7 +12,7 @@ Default Title Rule description goes here - + diff --git a/src/plugins/summaryWidget/res/testDataItemTemplate.html b/src/plugins/summaryWidget/res/testDataItemTemplate.html index 6c455aaec3..6afff4f5d2 100644 --- a/src/plugins/summaryWidget/res/testDataItemTemplate.html +++ b/src/plugins/summaryWidget/res/testDataItemTemplate.html @@ -7,7 +7,7 @@ - + diff --git a/src/plugins/summaryWidget/src/Condition.js b/src/plugins/summaryWidget/src/Condition.js index 3dd9586f37..f24684a0d6 100644 --- a/src/plugins/summaryWidget/src/Condition.js +++ b/src/plugins/summaryWidget/src/Condition.js @@ -188,7 +188,7 @@ define([ if (!this.config.values[index]) { this.config.values[index] = (inputType === 'number' ? 0 : ''); } - newInput = $(' '); + newInput = $(' '); this.valueInputs.push(newInput.get(0)); inputArea.append(newInput); index += 1;