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

Merge pull request #1627 from kensible/735-logoBrandingUpdate

Browse Source 
Updated logos and branding
This commit is contained in:
kensible 2016-04-27 10:01:43 -04:00
commit 78f0dde679
11 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/static/api/api.css
View File

@ -47,8 +47,9 @@ body .navbar .navbar-brand:hover {
}
body .navbar .navbar-brand img {
display: inline-block;
max-width: 150px;
max-height: 50px;
width: 93px;
height: 30px;
margin-right:14px;
}
body .navbar .navbar-brand > span {
display: inline-block;

7
awx/templates/rest_framework/api.html
View File

@ -24,7 +24,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'api:api_root_view' %}">
<img class="logo" src="{% static 'assets/main_menu_logo.png' %}">
<img class="logo" src="{% static 'assets/tower-logo-header.svg' %}">
<span>{% trans 'REST API' %}</span>
</a>
<a class="navbar-title" href="{{ request.get_full_path }}">
@ -49,10 +49,7 @@
<div id="footer">
<div class="container">
<div class="row">
<div class="col-sm-6 footer-logo">
<a href="http://www.ansible.com" target="_blank">
<img alt="Red Hat, Inc. | Ansible, Inc." src="{% static 'assets/footer-logo.png' %}" />
</a>
<div class="col-sm-6">
</div>
<div class="col-sm-6 footer-copyright">
Copyright &copy; 2016 <a href="http://www.redhat.com" target="_blank">Red Hat</a>, Inc. All Rights Reserved.

1
awx/ui/client/assets/tower-logo-header.svg Normal file
View File

@ -0,0 +1 @@
<svg id="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92.42 30"><defs><style>.cls-1{fill:#707070;}.cls-2{fill:#fff;}</style></defs><title>tower-logo-header2</title><path class="cls-1" d="M40.6,9.8V20.9H39.2V9.8H35.6V8.5h8.6V9.7l-3.6.1h0Z"/><path class="cls-1" d="M50.8,21.1c-3.1,0-5.1-2.6-5.1-6.4s2.1-6.4,5.2-6.4,5.2,2.6,5.2,6.4S53.9,21.1,50.8,21.1Zm0-11.5c-2.1,0-3.7,2-3.7,5.1s1.6,5.2,3.8,5.2,3.7-2,3.7-5.1S53,9.6,50.8,9.6h0Z"/><path class="cls-1" d="M68.4,20.9H66.8L64.9,13c-0.2-.8-0.5-2.1-0.6-2.8-0.1.8-.4,1.9-0.6,2.8l-1.9,7.9H60.3L57.7,8.5h1.4l1.4,7.9c0.1,0.8.4,2.2,0.5,2.8,0.1-.6.4-1.9,0.6-2.7l2-8H65l2,8c0.2,0.8.5,2.1,0.6,2.7,0.1-.6.3-1.9,0.5-2.8l1.4-7.9h1.3Z"/><path class="cls-1" d="M73.4,20.9V8.5h7.5V9.7H74.8v3.9h3.5v1.3H74.8v4.7h6.4v1.2C81.2,20.9,73.4,20.9,73.4,20.9Z"/><path class="cls-1" d="M89.6,15.5l2.7,5.4H90.7L88,15.6H85.1v5.3H83.7V8.5h4.9c2.2,0,3.8,1.1,3.8,3.5A3.09,3.09,0,0,1,89.6,15.5Zm-1-5.7H85.2v4.6h3.3c1.8,0,2.7-.8,2.7-2.3s-0.9-2.3-2.6-2.3h0Z"/><circle class="cls-1" cx="15" cy="15" r="15"/><path class="cls-2" d="M22.1,21l-6-14.4a1,1,0,0,0-1.8,0L7.7,22.3H10l2.6-6.5,7.7,6.3a2,2,0,0,0,.8.4,1,1,0,0,0,1.1-1V21.4A0.6,0.6,0,0,0,22.1,21ZM15.2,9.2l3.9,9.6-5.9-4.6Z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

1
awx/ui/client/assets/tower-logo-login.svg Normal file
View File

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

After

Width:  |  Height:  |  Size: 6.6 KiB

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

@ -23,10 +23,8 @@
padding-top: 0px;
}
.About-brand--redhat{
max-width: 420px;
margin: 0 auto;
margin-top: -50px;
margin-bottom: -30px;
float: left;
width: 112px;
}
.About-brand--ansible{
max-width: 120px;
@ -36,7 +34,14 @@
position: absolute;
top: 15px;
right: 15px;
z-index: 10;
}
.About p{
color: @default-interface-txt;
margin: 0;
font-size: 12px;
padding-top: 10px;
}
.About-modal--footer {
clear: both;
}

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

@ -2,7 +2,6 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<img class="About-brand--ansible img-responsive" src="/static/assets/ansible_tower_logo_minimalc.png" />
<button data-dismiss="modal" type="button" class="close About-close">
<span class="fa fa-times-circle"></span>
</button>
@ -22,11 +21,11 @@
|| ||
</pre>
</div>
<img class="About-brand--redhat img-responsive" src="/static/assets/redhat_ansible_lockup.png" />
<p class="text-center">Copyright 2016. All rights reserved.<br>
Ansible and Ansible Tower are registered trademarks of <a href="http://www.redhat.com/" target="_blank">Red Hat, Inc</a>.<br>
Visit <a href="http://www.ansible.com/" target="_blank">Ansible.com</a> for more information.<br>
{{subscription}}</p>
<div class="About-modal--footer">
<img class="About-brand--redhat img-responsive" src="/static/assets/tower-logo-login.svg" />
<p class="text-right">Copyright &copy; 2016 Red Hat, Inc. <br>
Visit <a href="http://www.ansible.com/" target="_blank">Ansible.com</a> for more information.<br>
</div>
</div>
</div>
</div>

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

@ -1,8 +1,3 @@
<footer class='Footer'>
<a href="http://www.ansible.com" target="_blank">
<div class="Footer-logo" ng-class="{'is-loggedOut' : !$root.current_user.username}">
<img id="footer-logo" alt="Red Hat, Inc. | Ansible, Inc." class="Footer-logoImage" src="/static/assets/footer-logo.png">
</div>
</a>
<div class="Footer-copyright" ng-class="{'is-loggedOut' : !$root.current_user.username}">Copyright &copy 2016 <a class="Footer-link" href="http://www.redhat.com" target="_blank">Red Hat</a>, Inc.</div>
</footer>

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

@ -42,7 +42,7 @@
}
.LoginModal-header {
text-align: center;
text-align: left;
background-color: @login-header-bg;
border-bottom: 0;
border-top-right-radius: 4px;
@ -56,14 +56,9 @@
padding-right: 20px;
}
.LoginModal-logoImage {
max-width: 100%;
}
.LoginModal-logoImage--notCustom {
max-width: 190px;
margin-top: 6px;
margin-bottom: 6px;
.LoginModal-logoImage, .LoginModal-logoImage--notCustom {
max-width: 112px;
margin: 20px 20px 10px 20px;
}
.LoginModal-alert {

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

@ -92,7 +92,7 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
scope.customLogo = "custom_console_logo.png";
scope.customLogoPresent = true;
} else {
scope.customLogo = "login_modal_logo.png";
scope.customLogo = "tower-logo-login.svg";
scope.customLogoPresent = false;
}

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

@ -26,6 +26,9 @@
.MainMenu-logoImage {
max-width: 147px;
max-height: 50px;
height: 30px;
width: 93px;
margin: 20px;
}
.MainMenu-item {
@ -172,7 +175,7 @@
}
.MainMenu-logoImage {
margin-top: 5px;
margin-top: 15px;
}
.MainMenu-item--notMobile {

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

@ -5,7 +5,7 @@
class="MainMenu-logo"
ng-class="{'is-loggedOut' : !$root.current_user.username}">
<img class="MainMenu-logoImage"
ng-src="/static/assets/main_menu_logo.png">
ng-src="/static/assets/tower-logo-header.svg">
</a>
<!-- Mobile menu items -->