Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Imroved usage of bootstrap.

Browse source
This commit is contained in:
Martin Edenhofer 2014-04-24 13:36:42 +02:00
parent 557592a542
commit a5684b1686
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/views/navigation.jst.eco
View file

@ -13,7 +13,7 @@
<% if item.navheader: %> <% if item.navheader: %>
<li class="dropdown-header"><%- @T( item.navheader ) %></li> <li class="dropdown-header"><%- @T( item.navheader ) %></li>
<% end %> <% end %>
<li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge count pull-right"><%= item['count'] %></span><% end %></a></li> <li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge count"><%= item['count'] %></span><% end %></a></li>
<% end %> <% end %>
</ul> </ul>
</li> </li>
@ -25,7 +25,7 @@
</ul> </ul>
<div class="spinner"/> <div class="spinner"/>
<% if !_.isEmpty(@user): %> <% if !_.isEmpty(@user): %>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav navbar-right">
<li class="dropdown"> <li class="dropdown">
<form class="navbar-form"> <form class="navbar-form">
@ -48,7 +48,7 @@
<% if item.navheader: %> <% if item.navheader: %>
<li class="dropdown-header"><%- @T( item.navheader ) %></li> <li class="dropdown-header"><%- @T( item.navheader ) %></li>
<% end %> <% end %>
<li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge count pull-right"><%= item['count'] %>)</span><% end %></a></li> <li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge count"><%= item['count'] %>)</span><% end %></a></li>
<% end %> <% end %>
</ul> </ul>
</li> </li>
@ -59,7 +59,7 @@
</ul> </ul>
<% else: %> <% else: %>
<!-- <!--
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="#login"><%- @T( 'Sign in' ) %></a></li> <li><a href="#login"><%- @T( 'Sign in' ) %></a></li>
</ul> </ul>
--> -->

4
app/assets/stylesheets/zzz.css
View file

@ -896,6 +896,10 @@ footer {
color: #fff; color: #fff;
} }
.nav.navbar-nav.navbar-right {
padding-right: 15px;
}
.nav.nav-tabs.nav-stacked > li > a > span { .nav.nav-tabs.nav-stacked > li > a > span {
visibility: hidden; visibility: hidden;
} }