- 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:
Charles Hacskaylo
2022-01-04 06:00:14 -08:00
committed by GitHub
parent e8e719e7f7
commit 43c2c8543e
3 changed files with 12 additions and 14 deletions

View File

@ -56,7 +56,7 @@ a.c-condition-widget {
} }
// When the widget is in the main view, center it in the space // 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; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;

View File

@ -9,7 +9,7 @@
/> />
</div> </div>
<div ref="objectViewWrapper" <div ref="objectViewWrapper"
:class="objectViewStyle" class="c-object-view"
></div> ></div>
</div> </div>
</template> </template>
@ -64,13 +64,6 @@ export default {
}, },
font() { font() {
return this.objectFontStyle ? this.objectFontStyle.font : this.layoutFont; 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() { destroyed() {

View File

@ -233,7 +233,6 @@
/******************************* MAIN AREA */ /******************************* MAIN AREA */
&__main-container { &__main-container {
// Wrapper for main views // Wrapper for main views
//display: flex; NEEDS REGRESSION TESTING!!!
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1 1 auto !important; flex: 1 1 auto !important;
@ -243,12 +242,12 @@
> * + * { > * + * {
margin-top: $interiorMargin; margin-top: $interiorMargin;
} }
}
&__main-object-view { > .c-object-view {
flex: 1 1 auto; flex: 1 1 auto;
overflow: auto; overflow: auto;
} }
}
&__tree { &__tree {
// Tree component within __pane-tree // Tree component within __pane-tree
@ -317,6 +316,12 @@
} }
} }
.c-object-view {
display: block;
height: 100%;
overflow: auto;
}
.is-editing { .is-editing {
.l-shell__main-container { .l-shell__main-container {
$m: 3px; $m: 3px;