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 @@