diff --git a/platform/commonUI/about/res/templates/about-dialog.html b/platform/commonUI/about/res/templates/about-dialog.html index 7840b8860b..d54ef2e9a9 100644 --- a/platform/commonUI/about/res/templates/about-dialog.html +++ b/platform/commonUI/about/res/templates/about-dialog.html @@ -1,12 +1,21 @@ -
- This is a placeholder for the about dialog. +
+
+ + +
- Show licenses. - -

- - {{version.name}} - {{version.value}} - -

+
+

OpenMCT Web

+
+

OpenMCT Web is a project of NASA's Ames Research Center. Copyright ©2015 NASA Ames Research Center, all rights reserved. Licensing information

+
+

Version Information

+
    +
  • + {{version.name}} + {{version.value}} +
    • +
+
+ diff --git a/platform/commonUI/about/res/templates/app-logo.html b/platform/commonUI/about/res/templates/app-logo.html index 8b3cefb5c0..75e495bd22 100644 --- a/platform/commonUI/about/res/templates/app-logo.html +++ b/platform/commonUI/about/res/templates/app-logo.html @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index d4f5ce296b..a65b5f5ef9 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1,5 +1,5 @@ /* CONSTANTS */ -/* line 17, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 17, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -20,38 +20,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; } @@ -360,7 +360,7 @@ span { font-size: 0.8em; } /* line 10, ../sass/_about.scss */ .t-about .s-logo-holder { - background: url("../images/bg-lunar-1.jpg") center no-repeat; + background: url("../images/bg-about-openmctweb.jpg") no-repeat center; background-size: cover; } /* line 14, ../sass/_about.scss */ .t-about .s-logo { @@ -368,26 +368,29 @@ span { background-repeat: no-repeat; background-size: contain; } /* line 20, ../sass/_about.scss */ + .t-about .s-logo-openmctweb { + background-image: url("../images/logo-openmctweb.svg"); } + /* line 23, ../sass/_about.scss */ .t-about h1, .t-about h2 { color: #fff; font-weight: normal !important; } - /* line 26, ../sass/_about.scss */ + /* line 29, ../sass/_about.scss */ .t-about.l-about.abs { overflow: auto; } - /* line 31, ../sass/_about.scss */ + /* line 34, ../sass/_about.scss */ .t-about .l-logo-holder { position: relative; height: 45%; } - /* line 34, ../sass/_about.scss */ + /* line 37, ../sass/_about.scss */ .t-about .l-logo-holder .l-logo { position: absolute; } - /* line 37, ../sass/_about.scss */ + /* line 40, ../sass/_about.scss */ .t-about .l-logo-holder .l-logo.l-logo-app { top: 0; right: 25%; bottom: 0; left: 25%; } - /* line 42, ../sass/_about.scss */ + /* line 45, ../sass/_about.scss */ .t-about .l-logo-holder .l-logo.s-logo-nasa { background-image: url("../images/logo-nasa.svg"); top: 10px; @@ -398,7 +401,7 @@ span { height: auto; padding-bottom: 5%; padding-top: 5%; } - /* line 51, ../sass/_about.scss */ + /* line 54, ../sass/_about.scss */ .t-about .l-content { position: relative; margin-top: 10px; } @@ -2326,20 +2329,16 @@ input[type="text"] { font-size: 0.8em; line-height: 10px; padding-top: 1px; - text-transform: uppercase; - /* &.logo-warp { - background: url($dirImgs + 'logo-warp.png') no-repeat left top; - color: lighten($colorBodyBg, 40%); - font-size: 0.7rem; - padding-top: 3px; - text-align: right; - }*/ } + text-transform: uppercase; } + /* line 20, ../sass/user-environ/_bottom-bar.scss */ + .ue-bottom-bar .app-logo.logo-openmctweb { + background: url("../images/logo-openmctweb.svg") no-repeat center center; } -/* line 31, ../sass/user-environ/_bottom-bar.scss */ +/* line 26, ../sass/user-environ/_bottom-bar.scss */ .status.block { display: inline-block; margin-right: 20px; } - /* line 34, ../sass/user-environ/_bottom-bar.scss */ + /* line 29, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator { -webkit-border-radius: 2.7px; -moz-border-radius: 2.7px; @@ -2354,10 +2353,10 @@ input[type="text"] { font-size: 1.25em; vertical-align: middle; margin-right: 5px; } - /* line 42, ../sass/user-environ/_bottom-bar.scss */ + /* line 37, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator.ok { color: #009900; } - /* line 45, ../sass/user-environ/_bottom-bar.scss */ + /* line 40, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator.caution { color: #ffaa00; } @@ -2565,10 +2564,10 @@ input[type="text"] { .wait-spinner { display: block; position: absolute; - -webkit-animation: rotation 0.6s infinite linear; - -moz-animation: rotation 0.6s infinite linear; - -o-animation: rotation 0.6s infinite linear; - animation: rotation 0.6s infinite linear; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; border-color: rgba(0, 153, 204, 0.25); border-top-color: #0099cc; border-style: solid; @@ -2607,10 +2606,10 @@ input[type="text"] { .treeview .wait-spinner { display: block; position: absolute; - -webkit-animation: rotation 0.6s infinite linear; - -moz-animation: rotation 0.6s infinite linear; - -o-animation: rotation 0.6s infinite linear; - animation: rotation 0.6s infinite linear; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; border-color: rgba(0, 153, 204, 0.25); border-top-color: #0099cc; border-style: solid; diff --git a/platform/commonUI/general/res/images/bg-about-openmctweb.jpg b/platform/commonUI/general/res/images/bg-about-openmctweb.jpg new file mode 100644 index 0000000000..98abe542b0 Binary files /dev/null and b/platform/commonUI/general/res/images/bg-about-openmctweb.jpg differ diff --git a/platform/commonUI/general/res/images/bg-lunar-1.jpg b/platform/commonUI/general/res/images/bg-lunar-1.jpg deleted file mode 100644 index 5ac0b32e4d..0000000000 Binary files a/platform/commonUI/general/res/images/bg-lunar-1.jpg and /dev/null differ diff --git a/platform/commonUI/general/res/images/logo-openmctweb.svg b/platform/commonUI/general/res/images/logo-openmctweb.svg new file mode 100644 index 0000000000..4db4e60396 --- /dev/null +++ b/platform/commonUI/general/res/images/logo-openmctweb.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/commonUI/general/res/sass/_about.scss b/platform/commonUI/general/res/sass/_about.scss index 0d49fc87e5..47b6dd9ec6 100644 --- a/platform/commonUI/general/res/sass/_about.scss +++ b/platform/commonUI/general/res/sass/_about.scss @@ -8,7 +8,7 @@ font-size: 0.8em; } .s-logo-holder { - background: url($dirImgs + "bg-lunar-1.jpg") center no-repeat; + background: url($dirImgs + "bg-about-openmctweb.jpg") no-repeat center; // For OpenMCT Web. background-size: cover; } .s-logo { @@ -17,6 +17,9 @@ background-repeat: no-repeat; background-size: contain; } + .s-logo-openmctweb { + background-image: url($dirImgs + 'logo-openmctweb.svg'); + } h1, h2 { color: #fff; font-weight: normal !important; diff --git a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss b/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss index 9a1199ef53..451f2838e0 100644 --- a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss +++ b/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss @@ -17,14 +17,9 @@ line-height: $ueFooterH - 10px; padding-top: 1px; text-transform: uppercase; - // Moved following to warp/warp.scss -/* &.logo-warp { - background: url($dirImgs + 'logo-warp.png') no-repeat left top; - color: lighten($colorBodyBg, 40%); - font-size: 0.7rem; - padding-top: 3px; - text-align: right; - }*/ + &.logo-openmctweb { + background: url($dirImgs + 'logo-openmctweb.svg') no-repeat center center; + } } }