From e81c6d3c163da6b934beae476214004c6ad8cd6d Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 13 Jun 2017 13:56:22 -0700 Subject: [PATCH] committing AWX svg icons from trahman and committing the variables.less, I don't think it got picked up in my last commit --- awx/ui/client/assets/tower-logo-header.svg | 2 +- awx/ui/client/assets/tower-logo-login.svg | 2 +- awx/ui/client/assets/variables.less | 18 ++++++++++++++++++ awx/ui/client/src/about/about.partial.html | 3 +-- .../login/loginModal/loginModal.controller.js | 2 +- .../src/main-menu/main-menu.partial.html | 3 +-- 6 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 awx/ui/client/assets/variables.less diff --git a/awx/ui/client/assets/tower-logo-header.svg b/awx/ui/client/assets/tower-logo-header.svg index 61e1de41da..b78bfbd3c9 100644 --- a/awx/ui/client/assets/tower-logo-header.svg +++ b/awx/ui/client/assets/tower-logo-header.svg @@ -1 +1 @@ - \ No newline at end of file +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 index 2db9414ecd..b78bfbd3c9 100644 --- a/awx/ui/client/assets/tower-logo-login.svg +++ b/awx/ui/client/assets/tower-logo-login.svg @@ -1 +1 @@ -tower-logo-login2 \ No newline at end of file +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 new file mode 100644 index 0000000000..0e599621f6 --- /dev/null +++ b/awx/ui/client/assets/variables.less @@ -0,0 +1,18 @@ +// Default styles for AWX branding + +// Login modal icon +@login-max-width: 200px; +@login-magin: -30px 20px 10px -30px; + +// Main nav bar logo +@main-menu-width: 100px; +@main-menu-margin: 20px; +@main-menu-padding-top: 20px; +@main-menu-max-width: inherit; +@main-menu-max-height: inherit; +@main-menu-height: inherit; + +// About modal logo +@about-modal-float: left; +@about-modal-width: 200px; +@about-modal-padding-top: 13px; diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 50d3834ac1..5874221a54 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -21,8 +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 8abe4993f9..e65728cb21 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 = "default-logo-large.png"; + scope.customLogo = "tower-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 2bd354610a..398488add7 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -6,8 +6,7 @@ ng-class="{'is-loggedOut' : !current_user || !current_user.username, 'MainMenu-logoImage--licenseMissing': licenseMissing}"> - + ng-src="/static/assets/tower-logo-header.svg">