diff options
author | charlesh88 <charlesh88@gmail.com> | 2019-04-26 22:11:45 +0300 |
---|---|---|
committer | charlesh88 <charlesh88@gmail.com> | 2019-04-26 22:11:45 +0300 |
commit | 29d494f3140b4f41ef716367918a898cbf5144e3 (patch) | |
tree | b1d929e3aabb5079447c00b529a518c951962f55 | |
parent | efa2c58a13db99b4a78cfea23dfb10a5548bf6be (diff) |
Misc Fixes 3misc-fixes-3
- Fix about screen for better compatibility with VISTA;
- Better logo sizing in splash element;
-rw-r--r-- | src/styles-new/_about.scss | 23 | ||||
-rw-r--r-- | src/ui/layout/AboutDialog.vue | 33 |
2 files changed, 33 insertions, 23 deletions
diff --git a/src/styles-new/_about.scss b/src/styles-new/_about.scss index df7fbb48b..2f8eeecbf 100644 --- a/src/styles-new/_about.scss +++ b/src/styles-new/_about.scss @@ -54,10 +54,11 @@ &:after { // App logo - top: 0; - right: 15%; - bottom: 0; - left: 15%; + $d: 25%; + top: $d; + right: $d; + bottom: $d; + left: $d; } } @@ -75,12 +76,20 @@ &__image, &__text { - height: 50%; - flex: 1 1 0; + flex: 1 1 auto; + } + + &__image { + height: 35%; } &__text { + height: 65%; overflow: auto; + > * + * { + border-top: 1px solid $colorInteriorBorder; + margin-top: 1em; + } } &--licenses { @@ -107,7 +116,7 @@ h1, h2, h3 { font-weight: normal; - margin-bottom: 1em; + margin-bottom: .25em; } h1 { diff --git a/src/ui/layout/AboutDialog.vue b/src/ui/layout/AboutDialog.vue index fc235669b..e1514a97e 100644 --- a/src/ui/layout/AboutDialog.vue +++ b/src/ui/layout/AboutDialog.vue @@ -1,23 +1,24 @@ <template> <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 v-if="branding.aboutHtml" class="s-text l-content" v-html="branding.aboutHtml"></div> - <h1 class="l-title s-title">Open MCT</h1> - <div class="l-description s-description"> - <p>Open MCT, Copyright © 2014-2019, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p> - <p>Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.</p> - <p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p> - <p>Open MCT includes source code licensed under additional open source licenses. See the Open Source Licenses file included with this distribution or <a @click="showLicenses">click here for third party licensing information</a>.</p> + <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> + <div class="l-description s-description"> + <p>Open MCT, Copyright © 2014-2019, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p> + <p>Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.</p> + <p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p> + <p>Open MCT includes source code licensed under additional open source licenses. See the Open Source Licenses file included with this distribution or <a @click="showLicenses">click here for third party licensing information</a>.</p> + </div> + <h2>Version Information</h2> + <ul class="t-info l-info s-info"> + <li>Version: {{buildInfo.version || 'Unknown'}}</li> + <li>Build Date: {{buildInfo.buildDate || 'Unknown'}}</li> + <li>Revision: {{buildInfo.revision || 'Unknown'}}</li> + <li>Branch: {{buildInfo.branch || 'Unknown'}}</li> + </ul> </div> - <h2>Version Information</h2> - <ul class="t-info l-info s-info"> - <li>Version: {{buildInfo.version || 'Unknown'}}</li> - <li>Build Date: {{buildInfo.buildDate || 'Unknown'}}</li> - <li>Revision: {{buildInfo.revision || 'Unknown'}}</li> - <li>Branch: {{buildInfo.branch || 'Unknown'}}</li> - </ul> </div> </div> </template> |