From 850c0d74a1136e8b0a83c8cf731b61fc7a1d50cb Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 13 Jun 2017 10:52:48 -0700 Subject: [PATCH] using .less variables for replacing styles and other feedback from PR --- awx/ui/client/assets/awx_branding.block.less | 19 ----------------- .../client/assets/tower_branding.block.less | 21 ------------------- awx/ui/client/legacy-styles/ansible-ui.less | 3 +-- awx/ui/client/src/about/about.block.less | 16 +++++++++----- awx/ui/client/src/about/about.partial.html | 2 +- .../login/loginModal/loginModal.block.less | 10 +++++++++ .../login/loginModal/loginModal.controller.js | 3 +-- .../client/src/main-menu/main-menu.block.less | 10 +++++++++ .../src/main-menu/main-menu.partial.html | 3 +-- 9 files changed, 35 insertions(+), 52 deletions(-) delete mode 100644 awx/ui/client/assets/awx_branding.block.less delete mode 100644 awx/ui/client/assets/tower_branding.block.less diff --git a/awx/ui/client/assets/awx_branding.block.less b/awx/ui/client/assets/awx_branding.block.less deleted file mode 100644 index 2685e8ce76..0000000000 --- a/awx/ui/client/assets/awx_branding.block.less +++ /dev/null @@ -1,19 +0,0 @@ -// Styling for login modal logo -.LoginModal-logoImage, .LoginModal-logoImage--notCustom { - width: 200px; - margin: -30px 20px 10px -30px; -} - -// Styling for home button on left-hand side of the nav bar -.MainMenu-logoImage { - width: 100px; - margin: 20px; - padding-top: 20px; -} - -// Styling for the about modal -.About-brandImg { - float: left; - width: 200px; - padding-top: 13px; -} diff --git a/awx/ui/client/assets/tower_branding.block.less b/awx/ui/client/assets/tower_branding.block.less deleted file mode 100644 index 441621ff56..0000000000 --- a/awx/ui/client/assets/tower_branding.block.less +++ /dev/null @@ -1,21 +0,0 @@ -// Styling for login modal logo -.LoginModal-logoImage, .LoginModal-logoImage--notCustom { - max-width: 112px; - margin: 20px 20px 10px 20px; -} - -// Styling for home button on left-hand side of the nav bar -.MainMenu-logoImage { - max-width: 147px; - max-height: 50px; - height: 30px; - width: 93px; - margin: 20px; -} - -// Styling for the about modal -.About-brandImg { - float: left; - width: 112px; - padding-top: 13px; -} diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 694cb14974..46957217e0 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -43,8 +43,7 @@ @import "text-label.less"; @import "./bootstrap-datepicker.less"; @import "./client/src/shared/branding/colors.default.less"; -// @import "./client/assets/tower_branding.block.less"; -@import "./client/assets/awx_branding.block.less"; +@import "./client/assets/variables.less"; // Bootstrap default overrides @import "./client/src/shared/bootstrap-settings.less"; /* Bootstrap fix that's causing a right margin to appear diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less index 0b041f716a..87bd710fa3 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -1,6 +1,6 @@ /** @define About */ @import "./client/src/shared/branding/colors.default.less"; - +@import "./client/assets/variables.less"; .About-ansibleVersion, .About-cowsayCode { @@ -31,11 +31,17 @@ padding-bottom: 0px; } +.About-brandImg { + float: @about-modal-float; + width: @about-modal-width; + padding-top: @about-modal-padding-top; +} + .About-close { - position: absolute; - top: 15px; - right: 15px; - z-index: 10; + position: absolute; + top: 15px; + right: 15px; + z-index: 10; } .About-modalFooter { diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 174d91ddfd..50d3834ac1 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -21,7 +21,7 @@
- +

diff --git a/awx/ui/client/src/login/loginModal/loginModal.block.less b/awx/ui/client/src/login/loginModal/loginModal.block.less index d435d6c42d..13fb18c0e5 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.block.less +++ b/awx/ui/client/src/login/loginModal/loginModal.block.less @@ -1,4 +1,5 @@ @import "../../shared/branding/colors.default.less"; +@import "./client/assets/variables.less"; /** @define LoginModal */ .LoginModal-backDrop { @@ -56,6 +57,15 @@ padding-right: 20px; } +.LoginModal-logoImage { + max-width: 112px; + margin: 20px 20px 10px 20px; +} + +.LoginModal-logoImage--notCustom { + max-width: @login-max-width; + margin: @login-magin; +} .LoginModal-alert { margin-bottom: 20px; diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index 8fcc27a27f..8abe4993f9 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -98,8 +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 = "awx-logo-small.png"; + scope.customLogo = "default-logo-large.png"; scope.customLogoPresent = false; } scope.customLoginInfo = $AnsibleConfig.custom_login_info; 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 4c6be57237..bd9ead56be 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -1,4 +1,5 @@ @import "../shared/branding/colors.default.less"; +@import "./client/assets/variables.less"; /** @define MainMenu */ @@ -27,6 +28,15 @@ background-color: @menu-link-bg; } +.MainMenu-logoImage { + max-width: @main-menu-max-width; + max-height: @main-menu-max-height; + height: @main-menu-height; + width: @main-menu-width; + margin: @main-menu-margin; + padding-top: @main-menu-padding-top; +} + .MainMenu-logoImage--licenseMissing:hover{ cursor:default; background-color: @default-bg!important; 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 eb5a519895..2bd354610a 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -6,9 +6,8 @@ ng-class="{'is-loggedOut' : !current_user || !current_user.username, 'MainMenu-logoImage--licenseMissing': licenseMissing}"> + ng-src="/static/assets/default-logo-small.png"> -