shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Merge pull request #6579 from jaredevantabor/awx-logos

Browse Source 
Tower / AWX branding
This commit is contained in:
Jared Tabor 2017-06-14 11:53:49 -07:00 committed by GitHub
commit eecdc9eb5e
8 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
awx/ui/client/assets/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

2
awx/ui/client/assets/tower-logo-header.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 38 KiB

2
awx/ui/client/assets/tower-logo-login.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 38 KiB

18
awx/ui/client/assets/variables.less Normal file
View File

@ -0,0 +1,18 @@
// Default styles for AWX branding
// Login modal icon
@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;
// About modal logo
@about-modal-float: left;
@about-modal-width: 200px;
@about-modal-padding-top: 13px;

1
awx/ui/client/legacy-styles/ansible-ui.less
View File

@ -43,6 +43,7 @@
@import "text-label.less"; @import "text-label.less";
@import "./bootstrap-datepicker.less"; @import "./bootstrap-datepicker.less";
@import "./client/src/shared/branding/colors.default.less"; @import "./client/src/shared/branding/colors.default.less";
@import "./client/assets/variables.less";
// Bootstrap default overrides // Bootstrap default overrides
@import "./client/src/shared/bootstrap-settings.less"; @import "./client/src/shared/bootstrap-settings.less";
/* Bootstrap fix that's causing a right margin to appear /* Bootstrap fix that's causing a right margin to appear

17
awx/ui/client/src/about/about.block.less
View File

@ -1,6 +1,6 @@
/** @define About */ /** @define About */
@import "./client/src/shared/branding/colors.default.less"; @import "./client/src/shared/branding/colors.default.less";
@import "./client/assets/variables.less";
.About-ansibleVersion, .About-ansibleVersion,
.About-cowsayCode { .About-cowsayCode {
@ -30,17 +30,18 @@
padding-top: 0px; padding-top: 0px;
padding-bottom: 0px; padding-bottom: 0px;
} }
.About-brandImg { .About-brandImg {
float: left; float: @about-modal-float;
width: 112px; width: @about-modal-width;
padding-top: 13px; padding-top: @about-modal-padding-top;
} }
.About-close { .About-close {
position: absolute; position: absolute;
top: 15px; top: 15px;
right: 15px; right: 15px;
z-index: 10; z-index: 10;
} }
.About-modalFooter { .About-modalFooter {

8
awx/ui/client/src/login/loginModal/loginModal.block.less
View File

@ -1,4 +1,5 @@
@import "../../shared/branding/colors.default.less"; @import "../../shared/branding/colors.default.less";
@import "./client/assets/variables.less";
/** @define LoginModal */ /** @define LoginModal */
.LoginModal-backDrop { .LoginModal-backDrop {
@ -56,11 +57,16 @@
padding-right: 20px; padding-right: 20px;
} }
.LoginModal-logoImage, .LoginModal-logoImage--notCustom { .LoginModal-logoImage {
max-width: 112px; max-width: 112px;
margin: 20px 20px 10px 20px; margin: 20px 20px 10px 20px;
} }
.LoginModal-logoImage--notCustom {
max-width: @login-max-width;
margin: @login-margin;
}
.LoginModal-alert { .LoginModal-alert {
margin-bottom: 20px; margin-bottom: 20px;
font-size: 16px; font-size: 16px;

12
awx/ui/client/src/main-menu/main-menu.block.less
View File

@ -1,4 +1,5 @@
@import "../shared/branding/colors.default.less"; @import "../shared/branding/colors.default.less";
@import "./client/assets/variables.less";
/** @define MainMenu */ /** @define MainMenu */
@ -28,11 +29,12 @@
} }
.MainMenu-logoImage { .MainMenu-logoImage {
max-width: 147px; max-width: @main-menu-max-width;
max-height: 50px; max-height: @main-menu-max-height;
height: 30px; height: @main-menu-height;
width: 93px; width: @main-menu-width;
margin: 20px; margin: @main-menu-margin;
padding-top: @main-menu-padding-top;
} }
.MainMenu-logoImage--licenseMissing:hover{ .MainMenu-logoImage--licenseMissing:hover{