Creating .less files for Tower branding and AWX branding

This separates the classes used for the Tower logos and the
AWX logos, into two separate files which I placed in /assets.
This commit is contained in:
Jared Tabor 2017-06-12 17:57:20 -07:00
parent d32ba1b992
commit 7b1c25bc3b
8 changed files with 45 additions and 18 deletions

View File

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

View File

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

View File

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

View File

@ -30,11 +30,6 @@
padding-top: 0px;
padding-bottom: 0px;
}
.About-brandImg {
float: left;
width: 112px;
padding-top: 13px;
}
.About-close {
position: absolute;

View File

@ -21,7 +21,8 @@
</pre>
</div>
<div class="About-modalFooter">
<img class="About-brandImg img-responsive" src="/static/assets/tower-logo-login.svg" />
<img class="About-brandImg img-responsive" src="/static/assets/awx-logo-small.png" />
<!-- <img class="About-brandImg img-responsive" src="/static/assets/tower-logo-login.svg" /> -->
<p class="About-footerText">
<span class="About-ansibleVersion">
Ansible {{ ansible_version }}

View File

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

View File

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

View File

@ -8,6 +8,7 @@
ng-class="{'MainMenu-logoImage--licenseMissing': licenseMissing}"
ng-src="/static/assets/awx-logo-small.png">
<!-- ng-src="/static/assets/tower-logo-header.svg"> -->
</a>
<!-- Mobile menu items -->