diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less index dfcf9a073c..0434a7f6fc 100644 --- a/awx/ui/client/assets/variables.less +++ b/awx/ui/client/assets/variables.less @@ -1,18 +1,24 @@ // Default styles for AWX branding // Login modal icon -@login-max-width: 200px; -@login-margin: -30px 20px 10px -30px; +@login-max-width: 200px; +@login-margin: -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; +@main-menu-width: 200px; +@main-menu-margin: -50px 0px 0px -40px; +@main-menu-max-width: initial; +@main-menu-max-height: initial; +@main-menu-height: initial; +@main-menu-margin-top-breakpoint: -55px; + // About modal logo -@about-modal-float: left; -@about-modal-width: 200px; -@about-modal-padding-top: 13px; +@about-modal-float: left; +@about-modal-width: 200px; +@about-modal-padding-top: initial; +@about-modal-margin-top: -60px; +@about-modal-margin-left: -50px; + +// Copyright text should be hidden +@copyright-text: 0; diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less index 87bd710fa3..6acf5e76a5 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -35,6 +35,8 @@ float: @about-modal-float; width: @about-modal-width; padding-top: @about-modal-padding-top; + margin-top: @about-modal-margin-top; + margin-left: @about-modal-margin-left; } .About-close { @@ -59,3 +61,7 @@ .About-ansibleVersion { color: @default-data-txt; } + +.Copyright-text{ + opacity: @copyright-text; +} diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 5874221a54..7ff5f4a16a 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -26,8 +26,10 @@ Ansible {{ ansible_version }}
- Copyright © 2017 Red Hat, Inc.
- Visit Ansible.com for more information.
+ + Copyright © 2017 Red Hat, Inc.
+ Visit Ansible.com for more information.
+

diff --git a/awx/ui/client/src/footer/footer.partial.html b/awx/ui/client/src/footer/footer.partial.html index 4a34bde28a..6ba9ac7c47 100644 --- a/awx/ui/client/src/footer/footer.partial.html +++ b/awx/ui/client/src/footer/footer.partial.html @@ -1,3 +1,3 @@ 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 bd9ead56be..6dec896079 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -34,7 +34,6 @@ height: @main-menu-height; width: @main-menu-width; margin: @main-menu-margin; - padding-top: @main-menu-padding-top; } .MainMenu-logoImage--licenseMissing:hover{ @@ -188,7 +187,7 @@ } .MainMenu-logoImage { - margin-top: 15px; + margin-top: @main-menu-margin-top-breakpoint; } .MainMenu-item--notMobile {