External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-939 applied new branding. The Tower is erect\!

Browse Source
This commit is contained in:
chris Houseknecht 2014-01-22 18:19:25 -05:00
parent 337bbc0a9c
commit dbd0f46435
6 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
awx/ui/static/img/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
awx/ui/static/img/tower_console_bug.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
awx/ui/static/img/tower_console_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
awx/ui/static/img/tower_login_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

27
awx/ui/static/less/ansible-ui.less
View File

@ -320,8 +320,8 @@ dd {
}
/* footer variables */
@footer-height: 85px;
@footer-margin: 60px;
@footer-height: 96px;
@footer-margin: 40px;
@push-height: (@footer-height + @footer-margin);
@push-margin: 0px;
#wrap {
@ -341,7 +341,7 @@ dd {
}
.main-menu .nav {
margin-top: 10px;
margin-top: 0;
}
.main-menu .nav > li > a {
@ -367,7 +367,8 @@ dd {
}
.navbar>.container .navbar-brand {
margin-left: -10px;
margin-left: 0;
margin-top: 10px;
}
/* Using inline-block rather than block keeps
@ -396,8 +397,8 @@ dd {
.site-footer {
width: 100%;
padding-top: 20px;
padding-bottom: 20px;
padding-top: 10px;
padding-bottom: 10px;
margin-top: 60px;
color: @grey;
text-align: center;
@ -414,7 +415,7 @@ dd {
}
.help {
padding-top: 15px;
padding-top: 18px;
font-weight: normal;
}
@ -427,19 +428,25 @@ dd {
}
.copyright {
padding-top: 15px;
padding-top: 18px;
font-weight: normal;
text-align: center;
}
}
.login-header {
.modal-header.login-header {
text-align: center;
background-color: @black;
border-left: 1px solid #686868;
border-right: 1px solid #686868;
border-top: 1px solid #686868;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
}
.login-header img {
max-width: 100px;
width: 327px;
}
.form-title {

8
awx/ui/templates/ui/index.html
View File

@ -138,7 +138,7 @@
<div class="navbar navbar-inverse navbar-fixed-top main-menu" role="navigation">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="#home"><img class="logo" src="{{ STATIC_URL }}img/logo.png" /></a>
<a class="navbar-brand" href="#home"><img class="logo" src="{{ STATIC_URL }}img/tower_console_logo.png" /></a>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -185,10 +185,10 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header login-header">
<img src="{{ STATIC_URL }}img/AWX_logo.png" />
<img src="{{ STATIC_URL }}img/tower_console_logo.png" />
</div>
<div class="modal-body">
<div class="login-alert" ng-show="(sessionExpired == false)">Welcome to AnsibleWorks AWX! &nbsp;Please sign in.</div>
<div class="login-alert" ng-show="(sessionExpired == false)">Welcome to Ansible Tower! &nbsp;Please sign in.</div>
<div class="login-alert" ng-show="(sessionExpired == true)">Your session timed out due to inactivity. Please sign in.</div>
<form id="login-form" name="loginForm" class="form-horizontal" autocomplete="off" novalidate >
<div class="form-group">
@ -376,7 +376,7 @@
</div>
<div class="col-lg-3">
<div class="logo">
<a href="http://www.ansibleworks.com" target="_blank"><img src="{{ STATIC_URL }}img/AWX_logo.png" /></a>
<a href="http://www.ansibleworks.com" target="_blank"><img src="{{ STATIC_URL }}img/tower_console_bug.png" /></a>
</div>
</div>
</div>