mirror of
https://github.com/nasa/openmct.git
synced 2025-04-16 07:26:53 +00:00
- New `c-object-view` class; - Removed CSS class special-casing in ObjectView.vue; - Removed unused `l-shell__main-object-view` class; - Fixed CSS selector for Condition Widget display in main view; Co-authored-by: John Hill <john.c.hill@nasa.gov> Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
This commit is contained in:
parent
e8e719e7f7
commit
43c2c8543e
@ -56,7 +56,7 @@ a.c-condition-widget {
|
||||
}
|
||||
|
||||
// When the widget is in the main view, center it in the space
|
||||
.l-shell__main-container > .c-condition-widget {
|
||||
.l-shell__main-container > * > .c-condition-widget {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
|
@ -9,7 +9,7 @@
|
||||
/>
|
||||
</div>
|
||||
<div ref="objectViewWrapper"
|
||||
:class="objectViewStyle"
|
||||
class="c-object-view"
|
||||
></div>
|
||||
</div>
|
||||
</template>
|
||||
@ -64,13 +64,6 @@ export default {
|
||||
},
|
||||
font() {
|
||||
return this.objectFontStyle ? this.objectFontStyle.font : this.layoutFont;
|
||||
},
|
||||
objectViewStyle() {
|
||||
if (this.domainObject && this.domainObject.type === 'time-strip') {
|
||||
return 'l-shell__main-object-view';
|
||||
} else {
|
||||
return 'u-contents';
|
||||
}
|
||||
}
|
||||
},
|
||||
destroyed() {
|
||||
|
@ -233,7 +233,6 @@
|
||||
/******************************* MAIN AREA */
|
||||
&__main-container {
|
||||
// Wrapper for main views
|
||||
//display: flex; NEEDS REGRESSION TESTING!!!
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1 1 auto !important;
|
||||
@ -243,11 +242,11 @@
|
||||
> * + * {
|
||||
margin-top: $interiorMargin;
|
||||
}
|
||||
}
|
||||
|
||||
&__main-object-view {
|
||||
flex: 1 1 auto;
|
||||
overflow: auto;
|
||||
> .c-object-view {
|
||||
flex: 1 1 auto;
|
||||
overflow: auto;
|
||||
}
|
||||
}
|
||||
|
||||
&__tree {
|
||||
@ -317,6 +316,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
.c-object-view {
|
||||
display: block;
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.is-editing {
|
||||
.l-shell__main-container {
|
||||
$m: 3px;
|
||||
|
Loading…
x
Reference in New Issue
Block a user