diff --git a/index.html b/index.html index 2535414aa7..6307a5f0dd 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,8 @@ mct.run(); }); - + + diff --git a/platform/commonUI/about/res/templates/about-dialog.html b/platform/commonUI/about/res/templates/about-dialog.html index fe19442f16..7b7dd436f5 100644 --- a/platform/commonUI/about/res/templates/about-dialog.html +++ b/platform/commonUI/about/res/templates/about-dialog.html @@ -21,7 +21,6 @@ -->
-

OpenMCT Web

diff --git a/platform/commonUI/general/res/images/bg-about-openmctweb.jpg b/platform/commonUI/general/res/images/bg-splash.jpg similarity index 100% rename from platform/commonUI/general/res/images/bg-about-openmctweb.jpg rename to platform/commonUI/general/res/images/bg-splash.jpg diff --git a/platform/commonUI/general/res/images/logo-openmctweb-shdw.svg b/platform/commonUI/general/res/images/logo-app-shdw.svg similarity index 99% rename from platform/commonUI/general/res/images/logo-openmctweb-shdw.svg rename to platform/commonUI/general/res/images/logo-app-shdw.svg index cd7b4cd19b..cf42b0621c 100644 --- a/platform/commonUI/general/res/images/logo-openmctweb-shdw.svg +++ b/platform/commonUI/general/res/images/logo-app-shdw.svg @@ -1,99 +1,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/commonUI/general/res/images/logo-openmctweb.svg b/platform/commonUI/general/res/images/logo-app.svg similarity index 98% rename from platform/commonUI/general/res/images/logo-openmctweb.svg rename to platform/commonUI/general/res/images/logo-app.svg index 4db4e60396..9a2acf1f81 100644 --- a/platform/commonUI/general/res/images/logo-openmctweb.svg +++ b/platform/commonUI/general/res/images/logo-app.svg @@ -1,70 +1,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/commonUI/general/res/sass/_logo-and-bg.scss b/platform/commonUI/general/res/sass/_logo-and-bg.scss index 136060cc9c..a78ac85e88 100644 --- a/platform/commonUI/general/res/sass/_logo-and-bg.scss +++ b/platform/commonUI/general/res/sass/_logo-and-bg.scss @@ -1,24 +1,49 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web 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 + * http://www.apache.org/licenses/LICENSE-2.0. + * + * 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. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +.l-splash, +.l-splash:before, +.l-splash:after { + background-position: center; + background-repeat: no-repeat; + position: absolute; +} + .l-splash { background-size: cover; - position: absolute; top: 0; right: 0; bottom: 0; left: 0; &:before, &:after { - background-position: center; - background-repeat: no-repeat; background-size: contain; content: ''; - position: absolute; } &:before { // NASA logo $w: 5%; $m: 10px; - background-image: url($dirImgs + 'logo-nasa.svg'); + background-image: url('/platform/commonUI/general/res/images/logo-nasa.svg'); top: $m; right: auto; bottom: auto; @@ -38,9 +63,10 @@ } } +/* .s-splash { - background-image: url($dirImgs + "bg-about-openmctweb.jpg"); // For OpenMCT Web. + background-image: url('/branding/res/images/bg-splash.jpg'); &:after { - background-image: url($dirImgs + 'logo-openmctweb-shdw.svg'); + background-image: url('/branding/res/images/logo-app-shdw.svg'); } -} \ No newline at end of file +}*/ diff --git a/platform/commonUI/general/res/sass/_startup.scss b/platform/commonUI/general/res/sass/_startup.scss deleted file mode 100644 index 3124cd1c45..0000000000 --- a/platform/commonUI/general/res/sass/_startup.scss +++ /dev/null @@ -1,47 +0,0 @@ -@import "bourbon"; -$dirImgs: '../../../general/res/images/'; -@import "logo-and-bg"; - -@mixin splashElem($m: 20%) { - top: $m; right: $m * 1.25; bottom: $m; left: $m * 1.25; - -} - -.l-splash-holder { - // Main outer holder. - @include transition-property(opacity); - @include transition-duration(500ms); - @include transition-timing-function(ease-in-out); - @include transition-delay(1s); - z-index: 10000; - opacity: 1; - &.fadeout { - opacity: 0; - pointer-events: none; - } - .l-splash { - // The splash element. - @include splashElem(); - border-radius: 10px; - box-shadow: 0 5px 50px 25px rgba(#fff, 0.1); - } -} - -@media only screen and (max-device-width: 767px) { - .l-splash-holder .l-splash { - @include splashElem(0); - border-radius: 0; - box-shadow: none; - } -} - -@media only screen and (max-device-width: 767px) and (orientation: portrait) { - .l-splash-holder .l-splash { - &:before { - $w: 12%; - width: $w * 2; - padding-bottom: $w; - padding-top: $w; - } - } -} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/startup-open.scss b/platform/commonUI/general/res/sass/openmct.scss similarity index 75% rename from platform/commonUI/general/res/sass/startup-open.scss rename to platform/commonUI/general/res/sass/openmct.scss index 0f13bf853d..43dc1736b0 100644 --- a/platform/commonUI/general/res/sass/startup-open.scss +++ b/platform/commonUI/general/res/sass/openmct.scss @@ -19,18 +19,21 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@import "startup"; +.app-logo { + background: url('/platform/commonUI/general/res/images/logo-app.svg') no-repeat center center; +} .l-splash-holder { background: #333; - position: absolute; - top: 0; right: 0; bottom: 0; left: 0; .s-splash { - background-image: url($dirImgs + "bg-about-openmctweb.jpg"); // For OpenMCT Web. - // &:before { // Use this to override the NASA logo. Could add a AMMOS logo along with NASA if desired. } - &:after { - // App logo - background-image: url($dirImgs + 'logo-openmctweb-shdw.svg'); - } + border-radius: 10px; + box-shadow: 0 5px 50px 25px rgba(255, 255, 255, 0.1); } } + +.s-splash { + background-image: url('/platform/commonUI/general/res/images/bg-splash.jpg'); + &:after { + background-image: url('/platform/commonUI/general/res/images/logo-app-shdw.svg'); + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/startup-base.scss b/platform/commonUI/general/res/sass/startup-base.scss new file mode 100644 index 0000000000..c99870f880 --- /dev/null +++ b/platform/commonUI/general/res/sass/startup-base.scss @@ -0,0 +1,70 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web 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 + * http://www.apache.org/licenses/LICENSE-2.0. + * + * 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. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +@import "bourbon"; +@import "logo-and-bg"; + +@mixin splashElem($m: 20%) { + top: $m; right: $m * 1.25; bottom: $m; left: $m * 1.25; +} + +.l-splash-holder { + // Main outer holder. + @include transition-property(opacity); + @include transition-duration(500ms); + @include transition-timing-function(ease-in-out); + @include transition-delay(1s); + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 10000; + opacity: 1; + &.fadeout { + opacity: 0; + pointer-events: none; + } + .l-splash { + // The splash element. + @include splashElem(); + } +} + +@media only screen and (max-device-width: 767px) { + .l-splash-holder .l-splash { + @include splashElem(0); + border-radius: 0; + box-shadow: none; + } +} + +@media only screen and (max-device-width: 767px) and (orientation: portrait) { + .l-splash-holder .l-splash { + &:before { + // Make the NASA logo a bit bigger when we're in portrait mode. + $w: 12%; + width: $w * 2; + padding-bottom: $w; + padding-top: $w; + } + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 23a47447b2..f2f73ead8a 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -100,9 +100,6 @@ left: auto; width: $ueAppLogoW; z-index: 2; - &.logo-openmctweb { - background: url($dirImgs + 'logo-openmctweb.svg') no-repeat center center; - } } } }