Main navigation and log styling

Simplified the styling to hopefully clear up the unreproducable, squishing logo issue.
This commit is contained in:
Chris Houseknecht
2014-07-01 17:42:00 -04:00
parent 26171c69b9
commit 13dcbb9a79
4 changed files with 15 additions and 13 deletions

View File

@@ -149,7 +149,6 @@
// Brand/project name // Brand/project name
.navbar-brand { .navbar-brand {
float: left;
padding: @navbar-padding-vertical @navbar-padding-horizontal; padding: @navbar-padding-vertical @navbar-padding-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
line-height: @line-height-computed; line-height: @line-height-computed;

File diff suppressed because one or more lines are too long

View File

@@ -24,21 +24,24 @@ body {
.navbar { .navbar {
margin-bottom: 0; margin-bottom: 0;
} }
.navbar-brand { #ansible-brand-logo {
position: absolute; width: 42px;
top: 6px; height: 42px;
left: 15px;
padding: 0px 15px 0 15px;
img {
width: 42px;
}
} }
.navbar-collapse { /*.navbar-collapse {
margin-left: 47px; margin-left: 47px;
} }*/
.collapsed-option { .collapsed-option {
display: none; display: none;
} }
.navbar-brand {
padding-top: 3px;
padding-bottom: 3px;
}
.nav > li > a {
padding-top: 11px;
padding-bottom: 11px;
}
} }
#content-container { #content-container {

View File

@@ -182,7 +182,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="http://www.ansible.com" target="_blank"><img src="{{ STATIC_URL }}img/tower_console_bug_black.png" /></a> <a class="navbar-brand" href="http://www.ansible.com" target="_blank"><img id="ansible-brand-logo" src="{{ STATIC_URL }}img/tower_console_bug_black.png" /></a>
</div> </div>
<div class="navbar-collapse collapse" id="main-navbar-collapse"> <div class="navbar-collapse collapse" id="main-navbar-collapse">
<ul class="nav navbar-nav" id="ansible-main-menu"> <ul class="nav navbar-nav" id="ansible-main-menu">