diff --git a/awx/ui/client/assets/logo-header.svg b/awx/ui/client/assets/logo-header.svg new file mode 100644 index 0000000000..6d80915fb6 --- /dev/null +++ b/awx/ui/client/assets/logo-header.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/awx/ui/client/assets/logo-login.svg b/awx/ui/client/assets/logo-login.svg new file mode 100644 index 0000000000..6d80915fb6 --- /dev/null +++ b/awx/ui/client/assets/logo-login.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/awx/ui/client/assets/tower-logo-header.svg b/awx/ui/client/assets/tower-logo-header.svg deleted file mode 100644 index b78bfbd3c9..0000000000 --- a/awx/ui/client/assets/tower-logo-header.svg +++ /dev/null @@ -1 +0,0 @@ -awl-logo-small \ 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 deleted file mode 100644 index b78bfbd3c9..0000000000 --- a/awx/ui/client/assets/tower-logo-login.svg +++ /dev/null @@ -1 +0,0 @@ -awl-logo-small \ No newline at end of file diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less index 0434a7f6fc..2c336408a8 100644 --- a/awx/ui/client/assets/variables.less +++ b/awx/ui/client/assets/variables.less @@ -1,24 +1,24 @@ // Default styles for AWX branding // Login modal icon -@login-max-width: 200px; -@login-margin: -30px 20px 10px -30px; +@login-max-width: 150px; +@login-margin: -15px 0px 0px 0px; // Main nav bar logo -@main-menu-width: 200px; -@main-menu-margin: -50px 0px 0px -40px; +@main-menu-width: 100px; +@main-menu-margin: 0px 0px 0px 0px; @main-menu-max-width: initial; @main-menu-max-height: initial; @main-menu-height: initial; -@main-menu-margin-top-breakpoint: -55px; +@main-menu-margin-top-breakpoint: -20px; // About modal logo @about-modal-float: left; -@about-modal-width: 200px; +@about-modal-width: 150px; @about-modal-padding-top: initial; -@about-modal-margin-top: -60px; -@about-modal-margin-left: -50px; +@about-modal-margin-top: -40px; +@about-modal-margin-left: -20px; // Copyright text should be hidden @copyright-text: 0; diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index c03c062527..091dd48808 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -21,7 +21,7 @@
- +

Ansible {{ ansible_version }} diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index 8bc8c86413..0ad7817a82 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -98,7 +98,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope', scope.customLogo = $rootScope.custom_logo; scope.customLogoPresent = true; } else { - scope.customLogo = "tower-logo-login.svg"; + scope.customLogo = "logo-login.svg"; scope.customLogoPresent = false; } scope.customLoginInfo = $AnsibleConfig.custom_login_info; 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 398488add7..f63b585ab8 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -6,7 +6,7 @@ ng-class="{'is-loggedOut' : !current_user || !current_user.username, 'MainMenu-logoImage--licenseMissing': licenseMissing}"> + ng-src="/static/assets/logo-header.svg">