External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6607 from jaredevantabor/awx-logos

Browse Source 
Awx logos
This commit is contained in:
Jared Tabor
2017-06-20 14:44:42 -07:00
committed by GitHub
parent 8bec16c1b0 6503d0cc84
commit 0121f5cde4
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
awx/ui/client/assets/variables.less
View File

@@ -1,18 +1,24 @@
// Default styles for AWX branding // Default styles for AWX branding
// Login modal icon // Login modal icon
@login-max-width: 200px; @login-max-width: 200px;
@login-margin: -30px 20px 10px -30px; @login-margin: -30px 20px 10px -30px;
// Main nav bar logo // Main nav bar logo
@main-menu-width: 100px; @main-menu-width: 200px;
@main-menu-margin: 20px; @main-menu-margin: -50px 0px 0px -40px;
@main-menu-padding-top: 20px; @main-menu-max-width: initial;
@main-menu-max-width: inherit; @main-menu-max-height: initial;
@main-menu-max-height: inherit; @main-menu-height: initial;
@main-menu-height: inherit; @main-menu-margin-top-breakpoint: -55px;
// About modal logo // About modal logo
@about-modal-float: left; @about-modal-float: left;
@about-modal-width: 200px; @about-modal-width: 200px;
@about-modal-padding-top: 13px; @about-modal-padding-top: initial;
@about-modal-margin-top: -60px;
@about-modal-margin-left: -50px;
// Copyright text should be hidden
@copyright-text: 0;

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

@@ -35,6 +35,8 @@
float: @about-modal-float; float: @about-modal-float;
width: @about-modal-width; width: @about-modal-width;
padding-top: @about-modal-padding-top; padding-top: @about-modal-padding-top;
margin-top: @about-modal-margin-top;
margin-left: @about-modal-margin-left;
} }
.About-close { .About-close {
@@ -59,3 +61,7 @@
.About-ansibleVersion { .About-ansibleVersion {
color: @default-data-txt; color: @default-data-txt;
} }
.Copyright-text{
opacity: @copyright-text;
}

6
awx/ui/client/src/about/about.partial.html
View File

@@ -26,8 +26,10 @@
<span class="About-ansibleVersion"> <span class="About-ansibleVersion">
Ansible {{ ansible_version }} Ansible {{ ansible_version }}
</span> <br> </span> <br>
Copyright &copy; 2017 Red Hat, Inc. <br> <span class="Copyright-text">
Visit <a href="http://www.ansible.com/" target="_blank">Ansible.com</a> for more information.<br> Copyright &copy; 2017 Red Hat, Inc. <br>
Visit <a href="http://www.ansible.com/" target="_blank">Ansible.com</a> for more information.<br>
</span>
</p> </p>
</div> </div>
</div> </div>

2
awx/ui/client/src/footer/footer.partial.html
View File

@@ -1,3 +1,3 @@
<footer class='Footer'> <footer class='Footer'>
<div class="Footer-copyright" ng-class="{'is-loggedOut' : !current_user || !current_user.username}">Copyright &copy 2017 <a class="Footer-link" href="http://www.redhat.com" target="_blank">Red Hat</a>, Inc.</div> <div class="Footer-copyright Copyright-text" ng-class="{'is-loggedOut' : !current_user || !current_user.username}">Copyright &copy 2017 <a class="Footer-link" href="http://www.redhat.com" target="_blank">Red Hat</a>, Inc.</div>
</footer> </footer>

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

@@ -34,7 +34,6 @@
height: @main-menu-height; height: @main-menu-height;
width: @main-menu-width; width: @main-menu-width;
margin: @main-menu-margin; margin: @main-menu-margin;
padding-top: @main-menu-padding-top;
} }
.MainMenu-logoImage--licenseMissing:hover{ .MainMenu-logoImage--licenseMissing:hover{
@@ -188,7 +187,7 @@
} }
.MainMenu-logoImage { .MainMenu-logoImage {
margin-top: 15px; margin-top: @main-menu-margin-top-breakpoint;
} }
.MainMenu-item--notMobile { .MainMenu-item--notMobile {