135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

navbar style fixes

Browse Source
This commit is contained in:
Oliver Gorwits
2012-03-03 16:09:11 +00:00
parent 5747ccc201
commit 3f3a521515
2 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/public/css/netdisco.css
View File

@@ -11,6 +11,12 @@ body {
cursor: pointer; cursor: pointer;
} }
/* for the "logged in as..." text */
.nd_navbartext {
color: #666;
padding-top: 11px;
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* various styles to adjust the hero box used for homepage + login */ /* various styles to adjust the hero box used for homepage + login */

21
Netdisco/views/layouts/main.tt
View File

@@ -39,20 +39,16 @@
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container" style="width: auto;"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="[% uri_for('/') %]">Netdisco</a> <a class="brand" href="[% uri_for('/') %]">Netdisco</a>
[% IF session.user %] [% IF session.user %]
<div class="nav-collapse">
<ul class="nav"> <ul class="nav">
<li class="active"><a href="[% uri_for('/') %]">Home</a></li> <li class="active"><a href="[% uri_for('/') %]">Home</a></li>
[% IF more_dd.size %] [% IF more_dd.size %]
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
More <b class="caret"></b>
</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
[% FOREACH title IN more_dd.keys.sort %] [% FOREACH title IN more_dd.keys.sort %]
<li><a href="[% uri_for(more_dd.$title) %]">[% title %]</a></li> <li><a href="[% uri_for(more_dd.$title) %]">[% title %]</a></li>
@@ -66,11 +62,11 @@
<img id="navsearchgo" class="navbar_icon" src="[% uri_base %]/images/crystalclear_mag.png"/> <img id="navsearchgo" class="navbar_icon" src="[% uri_base %]/images/crystalclear_mag.png"/>
</form> </form>
<ul class="nav pull-right"> <ul class="nav pull-right">
<li class="menu"> <li class="nd_navbartext">Logged in as &nbsp;</li>
<p>Logged in as &nbsp;</p>
</li>
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">[% session.user %]<b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
[% session.user %] <b class="caret"></b>
</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
[% FOREACH item IN user_dd %] [% FOREACH item IN user_dd %]
<li><a href="[% uri_for(item.link) %]">[% item.title %]</a></li> <li><a href="[% uri_for(item.link) %]">[% item.title %]</a></li>
@@ -82,7 +78,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
[% content %] [% content %]