From 6f26c9cd47e66ea08a50c802840338490a040c3d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 27 Jan 2015 14:56:10 -0800 Subject: [PATCH 1/2] [Front-end] Added drop-shadow version of app logo WTD-668 Added a version of the shadow with drop shadow on the About screen --- .../general/res/css/theme-espresso.css | 44 +++++++++---------- .../commonUI/general/res/sass/_about.scss | 5 +-- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index a65b5f5ef9..c8826aee39 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/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 17, ../../../../../../../../../../Library/Ruby/Gems/1.8/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/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/1.8/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/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/1.8/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/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/1.8/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; } @@ -369,7 +369,7 @@ span { background-size: contain; } /* line 20, ../sass/_about.scss */ .t-about .s-logo-openmctweb { - background-image: url("../images/logo-openmctweb.svg"); } + background-image: url("../images/logo-openmctweb-shdw.svg"); } /* line 23, ../sass/_about.scss */ .t-about h1, .t-about h2 { color: #fff; @@ -387,10 +387,10 @@ span { /* line 40, ../sass/_about.scss */ .t-about .l-logo-holder .l-logo.l-logo-app { top: 0; - right: 25%; + right: 15%; bottom: 0; - left: 25%; } - /* line 45, ../sass/_about.scss */ + left: 15%; } + /* line 44, ../sass/_about.scss */ .t-about .l-logo-holder .l-logo.s-logo-nasa { background-image: url("../images/logo-nasa.svg"); top: 10px; @@ -401,7 +401,7 @@ span { height: auto; padding-bottom: 5%; padding-top: 5%; } - /* line 54, ../sass/_about.scss */ + /* line 53, ../sass/_about.scss */ .t-about .l-content { position: relative; margin-top: 10px; } @@ -2564,10 +2564,10 @@ input[type="text"] { .wait-spinner { display: block; position: absolute; - -webkit-animation: rotation .6s infinite linear; - -moz-animation: rotation .6s infinite linear; - -o-animation: rotation .6s infinite linear; - animation: rotation .6s infinite linear; + -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; border-color: rgba(0, 153, 204, 0.25); border-top-color: #0099cc; border-style: solid; @@ -2606,10 +2606,10 @@ input[type="text"] { .treeview .wait-spinner { display: block; position: absolute; - -webkit-animation: rotation .6s infinite linear; - -moz-animation: rotation .6s infinite linear; - -o-animation: rotation .6s infinite linear; - animation: rotation .6s infinite linear; + -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; border-color: rgba(0, 153, 204, 0.25); border-top-color: #0099cc; border-style: solid; diff --git a/platform/commonUI/general/res/sass/_about.scss b/platform/commonUI/general/res/sass/_about.scss index 47b6dd9ec6..7a5a7bfa57 100644 --- a/platform/commonUI/general/res/sass/_about.scss +++ b/platform/commonUI/general/res/sass/_about.scss @@ -18,7 +18,7 @@ background-size: contain; } .s-logo-openmctweb { - background-image: url($dirImgs + 'logo-openmctweb.svg'); + background-image: url($dirImgs + 'logo-openmctweb-shdw.svg'); } h1, h2 { color: #fff; @@ -39,8 +39,7 @@ position: absolute; &.l-logo-app { // @include test(blue); - top: 0; right: $w * 5; bottom: 0; left: $w * 5; -// height: auto; width: auto; + top: 0; right: 15%; bottom: 0; left: 15%; } &.s-logo-nasa { // @include test(red); From 2f1a15268b98ad37339ed5b9a4dffa3fbddc420f Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 27 Jan 2015 16:28:43 -0800 Subject: [PATCH 2/2] [Front-end] Adding missing logo file WTD-668 --- .../res/images/logo-openmctweb-shdw.svg | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 platform/commonUI/general/res/images/logo-openmctweb-shdw.svg diff --git a/platform/commonUI/general/res/images/logo-openmctweb-shdw.svg b/platform/commonUI/general/res/images/logo-openmctweb-shdw.svg new file mode 100644 index 0000000000..cd7b4cd19b --- /dev/null +++ b/platform/commonUI/general/res/images/logo-openmctweb-shdw.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +