ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-26 00:01:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

View control fixes

Browse Source 
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;
This commit is contained in:
charlesh88 2018-07-03 14:25:39 -07:00
parent da0ed95662
commit 95457a1981
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/commonUI/general/res/sass/controls/_controls.scss
View File

@ -211,6 +211,7 @@ body.desktop .has-local-controls {
cursor: pointer; cursor: pointer;
height: 1em; width: 1em; height: 1em; width: 1em;
line-height: inherit; line-height: inherit;
position: relative;
&:before { &:before {
position: absolute; position: absolute;
@include trans-prop-nice(transform, 100ms); @include trans-prop-nice(transform, 100ms);

2
platform/features/notebook/res/templates/notebook.html
View File

@ -109,7 +109,7 @@
</div> </div>
</div> </div>
<!-- delete entry --> <!-- delete entry -->
<div class="holder flex-elem local-control notebook-entry-delete"> <div class="holder flex-elem local-control local-controls-hidden notebook-entry-delete">
<a class="s-icon-button icon-trash" id={{entry.id}} title="Delete Entry" ng-click="deleteEntry($event)"></a> <a class="s-icon-button icon-trash" id={{entry.id}} title="Delete Entry" ng-click="deleteEntry($event)"></a>
</div> </div>
</li> </li>

2
src/plugins/summaryWidget/res/conditionTemplate.html
View File

@ -4,7 +4,7 @@
<span class="t-configuration"> </span> <span class="t-configuration"> </span>
<span class="t-value-inputs"> </span> <span class="t-value-inputs"> </span>
</span> </span>
<span class="flex-elem local-control l-condition-action-buttons-wrapper"> <span class="flex-elem local-control local-controls-hidden l-condition-action-buttons-wrapper">
<a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this condition"></a> <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this condition"></a>
<a class="s-icon-button icon-trash t-delete" title="Delete this condition"></a> <a class="s-icon-button icon-trash t-delete" title="Delete this condition"></a>
</span> </span>

4
src/plugins/summaryWidget/res/ruleTemplate.html
View File

@ -3,7 +3,7 @@
<div class="widget-rule-header"> <div class="widget-rule-header">
<span class="flex-elem l-widget-thumb-wrapper"> <span class="flex-elem l-widget-thumb-wrapper">
<span class="grippy-holder"> <span class="grippy-holder">
<span class="t-grippy grippy local-control"></span> <span class="t-grippy grippy local-control local-controls-hidden"></span>
</span> </span>
<span class="view-control expanded"></span> <span class="view-control expanded"></span>
<span class="t-widget-thumb widget-thumb"> <span class="t-widget-thumb widget-thumb">
@ -12,7 +12,7 @@
</span> </span>
<span class="flex-elem rule-title">Default Title</span> <span class="flex-elem rule-title">Default Title</span>
<span class="flex-elem rule-description grows">Rule description goes here</span> <span class="flex-elem rule-description grows">Rule description goes here</span>
<span class="flex-elem local-control l-rule-action-buttons-wrapper"> <span class="flex-elem local-control local-controls-hidden l-rule-action-buttons-wrapper">
<a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this rule"></a> <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this rule"></a>
<a class="s-icon-button icon-trash t-delete" title="Delete this rule"></a> <a class="s-icon-button icon-trash t-delete" title="Delete this rule"></a>
</span> </span>

2
src/plugins/summaryWidget/res/testDataItemTemplate.html
View File

@ -7,7 +7,7 @@
<span class="equal-to hidden"> equal to </span> <span class="equal-to hidden"> equal to </span>
<span class="t-value-inputs"></span> <span class="t-value-inputs"></span>
</span> </span>
<span class="flex-elem local-control l-widget-test-data-item-action-buttons-wrapper"> <span class="flex-elem local-control local-controls-hidden l-widget-test-data-item-action-buttons-wrapper">
<a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this test value"></a> <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this test value"></a>
<a class="s-icon-button icon-trash t-delete" title="Delete this test value"></a> <a class="s-icon-button icon-trash t-delete" title="Delete this test value"></a>
</span> </span>

2
src/plugins/summaryWidget/src/Condition.js
View File

@ -188,7 +188,7 @@ define([
if (!this.config.values[index]) { if (!this.config.values[index]) {
this.config.values[index] = (inputType === 'number' ? 0 : ''); this.config.values[index] = (inputType === 'number' ? 0 : '');
} }
newInput = $('<input class="sm" type = "' + inputType + '" value = "' + this.config.values[index] + '"> </input>'); newInput = $('<input type = "' + inputType + '" value = "' + this.config.values[index] + '"> </input>');
this.valueInputs.push(newInput.get(0)); this.valueInputs.push(newInput.get(0));
inputArea.append(newInput); inputArea.append(newInput);
index += 1; index += 1;