diff --git a/awx/ui/client/assets/awx_branding.block.less b/awx/ui/client/assets/awx_branding.block.less new file mode 100644 index 0000000000..2685e8ce76 --- /dev/null +++ b/awx/ui/client/assets/awx_branding.block.less @@ -0,0 +1,19 @@ +// 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 new file mode 100644 index 0000000000..441621ff56 --- /dev/null +++ b/awx/ui/client/assets/tower_branding.block.less @@ -0,0 +1,21 @@ +// 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 30911ba194..694cb14974 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -43,6 +43,8 @@ @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"; // 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 73cd7a9937..0b041f716a 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -30,11 +30,6 @@ padding-top: 0px; padding-bottom: 0px; } -.About-brandImg { - float: left; - width: 112px; - padding-top: 13px; -} .About-close { position: absolute; diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 5874221a54..174d91ddfd 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -21,7 +21,8 @@
- + +

Ansible {{ ansible_version }} diff --git a/awx/ui/client/src/login/loginModal/loginModal.block.less b/awx/ui/client/src/login/loginModal/loginModal.block.less index 0f283846d6..d435d6c42d 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.block.less +++ b/awx/ui/client/src/login/loginModal/loginModal.block.less @@ -56,10 +56,6 @@ padding-right: 20px; } -.LoginModal-logoImage, .LoginModal-logoImage--notCustom { - max-width: 112px; - margin: 20px 20px 10px 20px; -} .LoginModal-alert { margin-bottom: 20px; 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 0a20ccc07e..4c6be57237 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -27,14 +27,6 @@ background-color: @menu-link-bg; } -.MainMenu-logoImage { - max-width: 147px; - max-height: 50px; - height: 30px; - width: 93px; - margin: 20px; -} - .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 f82e0b7a71..eb5a519895 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -8,6 +8,7 @@ ng-class="{'MainMenu-logoImage--licenseMissing': licenseMissing}" ng-src="/static/assets/awx-logo-small.png"> +