From 792150f03387e3913dbd339d704967034cf1ba8f Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Wed, 20 Apr 2016 14:57:50 -0400 Subject: [PATCH 1/2] Updated logos and branding --- awx/static/api/api.css | 5 +++-- awx/templates/rest_framework/api.html | 2 +- awx/ui/client/assets/tower-logo-header.svg | 1 + awx/ui/client/assets/tower-logo-login.svg | 1 + awx/ui/client/src/about/about.block.less | 17 +++++++++++------ awx/ui/client/src/about/about.partial.html | 11 +++++------ awx/ui/client/src/footer/footer.partial.html | 5 ----- .../src/login/loginModal/loginModal.block.less | 13 ++++--------- .../login/loginModal/loginModal.controller.js | 2 +- .../client/src/main-menu/main-menu.block.less | 5 ++++- .../client/src/main-menu/main-menu.partial.html | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 awx/ui/client/assets/tower-logo-header.svg create mode 100644 awx/ui/client/assets/tower-logo-login.svg diff --git a/awx/static/api/api.css b/awx/static/api/api.css index 509d604f2f..a1d7a3fb55 100644 --- a/awx/static/api/api.css +++ b/awx/static/api/api.css @@ -47,8 +47,9 @@ body .navbar .navbar-brand:hover { } body .navbar .navbar-brand img { display: inline-block; - max-width: 150px; - max-height: 50px; + width: 93px; + height: 30px; + margin-right:14px; } body .navbar .navbar-brand > span { display: inline-block; diff --git a/awx/templates/rest_framework/api.html b/awx/templates/rest_framework/api.html index 7ae3c811f8..0c10907419 100644 --- a/awx/templates/rest_framework/api.html +++ b/awx/templates/rest_framework/api.html @@ -24,7 +24,7 @@ - + {% trans 'REST API' %} diff --git a/awx/ui/client/assets/tower-logo-header.svg b/awx/ui/client/assets/tower-logo-header.svg new file mode 100644 index 0000000000..61e1de41da --- /dev/null +++ b/awx/ui/client/assets/tower-logo-header.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/awx/ui/client/assets/tower-logo-login.svg b/awx/ui/client/assets/tower-logo-login.svg new file mode 100644 index 0000000000..2db9414ecd --- /dev/null +++ b/awx/ui/client/assets/tower-logo-login.svg @@ -0,0 +1 @@ +tower-logo-login2 \ No newline at end of file diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less index d5453c0cf2..c2175648b6 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -2,7 +2,7 @@ @import "awx/ui/client/src/shared/branding/colors.default.less"; .About-cowsay--container{ - width: 340px; + width: 340px; margin: 0 auto; } .About-cowsay--code{ @@ -23,10 +23,8 @@ padding-top: 0px; } .About-brand--redhat{ - max-width: 420px; - margin: 0 auto; - margin-top: -50px; - margin-bottom: -30px; + float: left; + width: 112px; } .About-brand--ansible{ max-width: 120px; @@ -36,7 +34,14 @@ position: absolute; top: 15px; right: 15px; + z-index: 10; } .About p{ color: @default-interface-txt; -} \ No newline at end of file + margin: 0; + font-size: 12px; + padding-top: 10px; +} +.About-modal--footer { + clear: both; +} diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 8d0c355e5c..d3148fffa6 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -2,7 +2,6 @@
- @@ -22,11 +21,11 @@ || ||
- -

Copyright 2016. All rights reserved.
- Ansible and Ansible Tower are registered trademarks of Red Hat, Inc.
- Visit Ansible.com for more information.
- {{subscription}}

+
+ +

Copyright © 2016 Red Hat, Inc.
+ Visit Ansible.com for more information.
+

diff --git a/awx/ui/client/src/footer/footer.partial.html b/awx/ui/client/src/footer/footer.partial.html index 32ec05bb05..acfc2b1026 100644 --- a/awx/ui/client/src/footer/footer.partial.html +++ b/awx/ui/client/src/footer/footer.partial.html @@ -1,8 +1,3 @@ diff --git a/awx/ui/client/src/login/loginModal/loginModal.block.less b/awx/ui/client/src/login/loginModal/loginModal.block.less index 464eb3c9f0..d898bd3da4 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.block.less +++ b/awx/ui/client/src/login/loginModal/loginModal.block.less @@ -42,7 +42,7 @@ } .LoginModal-header { - text-align: center; + text-align: left; background-color: @login-header-bg; border-bottom: 0; border-top-right-radius: 4px; @@ -56,14 +56,9 @@ padding-right: 20px; } -.LoginModal-logoImage { - max-width: 100%; -} - -.LoginModal-logoImage--notCustom { - max-width: 190px; - margin-top: 6px; - margin-bottom: 6px; +.LoginModal-logoImage, .LoginModal-logoImage--notCustom { + max-width: 112px; + margin: 20px 20px 10px 20px; } .LoginModal-alert { diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index 001abc3591..04602805c4 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -92,7 +92,7 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l scope.customLogo = "custom_console_logo.png"; scope.customLogoPresent = true; } else { - scope.customLogo = "login_modal_logo.png"; + scope.customLogo = "tower-logo-login.svg"; scope.customLogoPresent = false; } diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less index d64b5de3d3..89bafa127a 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -26,6 +26,9 @@ .MainMenu-logoImage { max-width: 147px; max-height: 50px; + height: 30px; + width: 93px; + margin: 20px; } .MainMenu-item { @@ -172,7 +175,7 @@ } .MainMenu-logoImage { - margin-top: 5px; + margin-top: 15px; } .MainMenu-item--notMobile { diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html index f05ab5b1ab..9b2b3ee7af 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -5,7 +5,7 @@ class="MainMenu-logo" ng-class="{'is-loggedOut' : !$root.current_user.username}"> + ng-src="/static/assets/tower-logo-header.svg"> From 3991016ebea129d51a426e46f9af2d6831ed64b2 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Wed, 20 Apr 2016 15:13:38 -0400 Subject: [PATCH 2/2] Removed logos from footer in api browser --- awx/templates/rest_framework/api.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/awx/templates/rest_framework/api.html b/awx/templates/rest_framework/api.html index 0c10907419..7a0df3670d 100644 --- a/awx/templates/rest_framework/api.html +++ b/awx/templates/rest_framework/api.html @@ -49,10 +49,7 @@