diff --git a/src/plugins/conditionWidget/ConditionWidgetViewProvider.js b/src/plugins/conditionWidget/ConditionWidgetViewProvider.js index 879cf0c019..f8ff2484ae 100644 --- a/src/plugins/conditionWidget/ConditionWidgetViewProvider.js +++ b/src/plugins/conditionWidget/ConditionWidgetViewProvider.js @@ -28,7 +28,6 @@ export default function ConditionWidget(openmct) { key: 'conditionWidget', name: 'Condition Widget', cssClass: 'icon-asterisk', - objectClass: 'o-condition-widget', canView: function (domainObject) { return domainObject.type === 'conditionWidget'; }, diff --git a/src/plugins/conditionWidget/components/ConditionWidget.vue b/src/plugins/conditionWidget/components/ConditionWidget.vue index d86d0b9f18..d882d42776 100644 --- a/src/plugins/conditionWidget/components/ConditionWidget.vue +++ b/src/plugins/conditionWidget/components/ConditionWidget.vue @@ -1,6 +1,8 @@ diff --git a/src/plugins/conditionWidget/components/condition-widget.scss b/src/plugins/conditionWidget/components/condition-widget.scss new file mode 100644 index 0000000000..16075ce74d --- /dev/null +++ b/src/plugins/conditionWidget/components/condition-widget.scss @@ -0,0 +1,15 @@ +.c-condition-widget { + @include userSelectNone(); + border-radius: $basicCr; + border: 1px solid transparent; + display: inline-block; + padding: $interiorMarginLg $interiorMarginLg * 2; +} + +.c-so-view--no-frame > .c-so-view__object-view > .c-condition-widget { + @include abs(); + display: flex; + align-items: center; + justify-content: center; + padding: 0; +} diff --git a/src/plugins/displayLayout/components/SubobjectView.vue b/src/plugins/displayLayout/components/SubobjectView.vue index 3fb724bbd6..6d758cf018 100644 --- a/src/plugins/displayLayout/components/SubobjectView.vue +++ b/src/plugins/displayLayout/components/SubobjectView.vue @@ -45,7 +45,7 @@ import LayoutFrame from './LayoutFrame.vue' const MINIMUM_FRAME_SIZE = [320, 180], DEFAULT_DIMENSIONS = [10, 10], DEFAULT_POSITION = [1, 1], - DEFAULT_HIDDEN_FRAME_TYPES = ['hyperlink', 'summary-widget']; + DEFAULT_HIDDEN_FRAME_TYPES = ['hyperlink', 'summary-widget', 'conditionWidget']; function getDefaultDimensions(gridSize) { return MINIMUM_FRAME_SIZE.map((min, index) => { diff --git a/src/styles/vue-styles.scss b/src/styles/vue-styles.scss index bed5add398..27d89822f8 100644 --- a/src/styles/vue-styles.scss +++ b/src/styles/vue-styles.scss @@ -2,6 +2,7 @@ @import "../api/overlays/components/overlay-component.scss"; @import "../plugins/condition/components/condition.scss"; @import "../plugins/condition/components/condition-set.scss"; +@import "../plugins/conditionWidget/components/condition-widget.scss"; @import "../plugins/condition/components/inspector/conditional-styles.scss"; @import "../plugins/displayLayout/components/box-view.scss"; @import "../plugins/displayLayout/components/display-layout.scss"; diff --git a/src/ui/components/ObjectFrame.vue b/src/ui/components/ObjectFrame.vue index d33b2ae913..e9657a6e9c 100644 --- a/src/ui/components/ObjectFrame.vue +++ b/src/ui/components/ObjectFrame.vue @@ -65,7 +65,7 @@ const SIMPLE_CONTENT_TYPES = [ 'timer', 'summary-widget', 'hyperlink', - 'condition-widget' + 'conditionWidget' ]; export default {