External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

committing AWX svg icons from trahman

Browse Source 
and committing the variables.less, I don't think it got picked up
in my last commit
This commit is contained in:
Jared Tabor
2017-06-13 13:56:22 -07:00
parent 850c0d74a1
commit e81c6d3c16
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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-magin: -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;

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

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

2
awx/ui/client/src/login/loginModal/loginModal.controller.js
View File

@@ -98,7 +98,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope',
scope.customLogo = $rootScope.custom_logo; scope.customLogo = $rootScope.custom_logo;
scope.customLogoPresent = true; scope.customLogoPresent = true;
} else { } else {
scope.customLogo = "default-logo-large.png"; scope.customLogo = "tower-logo-login.svg";
scope.customLogoPresent = false; scope.customLogoPresent = false;
} }
scope.customLoginInfo = $AnsibleConfig.custom_login_info; scope.customLoginInfo = $AnsibleConfig.custom_login_info;

3
awx/ui/client/src/main-menu/main-menu.partial.html
View File

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