Misc Fixes 3 (#2389)

* Misc Fixes 3

- Fix Chrome 73 bug in overlay __contents-main element;
- Fixed messages by including erroneously missing _legacy-messages.scss
file;
- Better layout for messages in notification overlay list;

* Misc Fixes 3

- Fix about screen for better compatibility with VISTA;
- Better logo sizing in splash element;
This commit is contained in:
Charles Hacskaylo
2019-04-26 14:43:13 -07:00
committed by Andrew Henry
parent 138067dca9
commit 1c0df60f05
5 changed files with 43 additions and 31 deletions

View File

@ -9,6 +9,7 @@
ng-model="ngModel" ng-model="ngModel"
ng-show="ngModel.progressPerc !== undefined"></mct-include> ng-show="ngModel.progressPerc !== undefined"></mct-include>
</div> </div>
</div>
<div class="c-overlay__button-bar"> <div class="c-overlay__button-bar">
<button ng-repeat="dialogOption in ngModel.options" <button ng-repeat="dialogOption in ngModel.options"
class="c-button" class="c-button"
@ -21,5 +22,4 @@
{{ngModel.primaryOption.label}} {{ngModel.primaryOption.label}}
</button> </button>
</div> </div>
</div>
</div> </div>

View File

@ -92,6 +92,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1 1 auto; flex: 1 1 auto;
height: 0; // Chrome 73 overflow bug fix
overflow: auto; overflow: auto;
padding-right: $interiorMargin; // fend off scroll bar padding-right: $interiorMargin; // fend off scroll bar
} }

View File

@ -54,10 +54,11 @@
&:after { &:after {
// App logo // App logo
top: 0; $d: 25%;
right: 15%; top: $d;
bottom: 0; right: $d;
left: 15%; bottom: $d;
left: $d;
} }
} }
@ -75,12 +76,20 @@
&__image, &__image,
&__text { &__text {
height: 50%; flex: 1 1 auto;
flex: 1 1 0; }
&__image {
height: 35%;
} }
&__text { &__text {
height: 65%;
overflow: auto; overflow: auto;
> * + * {
border-top: 1px solid $colorInteriorBorder;
margin-top: 1em;
}
} }
&--licenses { &--licenses {
@ -107,7 +116,7 @@
h1, h2, h3 { h1, h2, h3 {
font-weight: normal; font-weight: normal;
margin-bottom: 1em; margin-bottom: .25em;
} }
h1 { h1 {

View File

@ -33,3 +33,4 @@
@import "table"; @import "table";
@import "legacy"; @import "legacy";
@import "legacy-plots"; @import "legacy-plots";
@import "legacy-messages";

View File

@ -1,9 +1,9 @@
<template> <template>
<div class="c-about c-about--splash"> <div class="c-about c-about--splash">
<div v-if="!branding.aboutHtml" class="c-about__image c-splash-image"></div> <div class="c-about__image c-splash-image"></div>
<div class="c-about__text s-text"> <div class="c-about__text s-text">
<div v-if="branding.aboutHtml" class="s-text l-content" v-html="branding.aboutHtml"></div> <div class="c-about__text__element" v-if="branding.aboutHtml" v-html="branding.aboutHtml"></div>
<div class="c-about__text__element">
<h1 class="l-title s-title">Open MCT</h1> <h1 class="l-title s-title">Open MCT</h1>
<div class="l-description s-description"> <div class="l-description s-description">
<p>Open MCT, Copyright &copy; 2014-2019, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p> <p>Open MCT, Copyright &copy; 2014-2019, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p>
@ -19,6 +19,7 @@
<li>Branch: {{buildInfo.branch || 'Unknown'}}</li> <li>Branch: {{buildInfo.branch || 'Unknown'}}</li>
</ul> </ul>
</div> </div>
</div>
</div> </div>
</template> </template>
<script> <script>