- 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
.l-shell__main-container > .c-condition-widget {
.l-shell__main-container > * > .c-condition-widget {
position: absolute;
top: 50%;
left: 50%;

View File

@ -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() {

View File

@ -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;