ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-02 19:36:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

css fixes and add any/all control

Browse Source
This commit is contained in:
Joel McKinnon 2020-01-16 09:13:43 -08:00
parent 82f175f6c7
commit fa0a54eee7
2 changed files with 62 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/condition/components/ConditionEdit.vue
View File

@ -34,7 +34,7 @@
<div class="c-sw-rule"> <div class="c-sw-rule">
<div class="c-sw-rule__ui l-compact-form l-widget-rule has-local-controls"> <div class="c-sw-rule__ui l-compact-form l-widget-rule has-local-controls">
<div> <div>
<ul> <ul class="t-widget-rule-config">
<li> <li>
<label>Condition Name</label> <label>Condition Name</label>
<span class="controls"> <span class="controls">
@ -53,8 +53,27 @@
</select> </select>
</span> </span>
</li> </li>
<li v-if="telemetryObject && telemetryMetadata"> </ul>
<div v-if="!condition.isDefault"
class="widget-rule-content expanded"
>
<ul class="t-widget-rule-config">
<li class="has-local-controls t-condition">
<label>Match when</label>
<span class="controls">
<select>
<option value="all">All criteria are met</option>
<option value="any">Any criteria are met</option>
</select>
</span>
</li>
</ul>
<ul class="t-widget-rule-config">
<li v-if="telemetryObject && telemetryMetadata"
class="has-local-controls t-condition"
>
<label>when</label> <label>when</label>
<span class="t-configuration">
<span class="controls"> <span class="controls">
<select class=""> <select class="">
<option value="">- Select Telemetry -</option> <option value="">- Select Telemetry -</option>
@ -72,7 +91,6 @@
</option> </option>
</select> </select>
</span> </span>
<span class="controls"> <span class="controls">
<select v-model="selectedOperationKey"> <select v-model="selectedOperationKey">
<option value="">- Select Comparison -</option> <option value="">- Select Comparison -</option>
@ -84,6 +102,7 @@
</option> </option>
</select> </select>
</span> </span>
</span>
</li> </li>
</ul> </ul>
</div> </div>
@ -91,6 +110,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</template> </template>

20
src/plugins/condition/components/condition.scss
View File

@ -57,35 +57,33 @@
padding: 0; padding: 0;
} }
.l-compact-form ul li {
padding: 0;
}
.widget-rule-content.expanded { .widget-rule-content.expanded {
margin: 0 3px; margin: 0 3px;
} }
.widget-rule-content.expanded ul { .widget-rule-content.expanded ul {
border-top: solid 1px #ccc; border-top: solid 1px #ccc;
padding: 5px; padding: 2px;
}
.l-compact-form ul li {
padding: 1px 0;
} }
.l-compact-form ul li .controls { .l-compact-form ul li .controls {
line-height: 20px; display: inline-flex;
min-height: 20px; flex-grow: inherit;
padding: 2px 0;
} }
.l-compact-form ul li > label { .l-compact-form ul li > label {
display: block; display: block;
width: 90px; width: 90px;
min-width: 90px;
text-align: right; text-align: right;
line-height: 20px; line-height: 20px;
} }
.l-compact-form ul li .controls {
flex-grow: inherit;
}
.l-compact-form ul li .controls input[type="text"], .l-compact-form ul li .controls input[type="text"],
.l-compact-form ul li .controls input[type="search"], .l-compact-form ul li .controls input[type="search"],
.l-compact-form ul li .controls input[type="number"], .l-compact-form ul li .controls input[type="number"],