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

refactor main navigation

Browse source 
because of annoying bootstrap inheritance
This commit is contained in:
Felix Niklas 2014-09-19 13:18:58 +02:00
parent bab5c40cb1
commit e39ec902ff
3 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/navigation.js.coffee
View file

@ -59,7 +59,7 @@ class App.Navigation extends App.Controller
href = $(d).attr('href') href = $(d).attr('href')
active_tab[href] = true active_tab[href] = true
) )
@el.find('.navbar-items-menu').html App.view('navigation/menu')( @el.find('.main-navigation').html App.view('navigation/menu')(
items: items items: items
open_tab: open_tab open_tab: open_tab
active_tab: active_tab active_tab: active_tab

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

@ -9,7 +9,7 @@
<ul id="global-search-result" class="custom-dropdown-menu" role="menu"></ul> <ul id="global-search-result" class="custom-dropdown-menu" role="menu"></ul>
</form> </form>
<ul class="nav navbar-nav navbar-items-menu"></ul> <ul class="main-navigation"></ul>
<div class="tasks tasks-navigation flex"></div> <div class="tasks tasks-navigation flex"></div>

40
app/assets/stylesheets/zzz.css.erb
View file

@ -1412,26 +1412,34 @@ footer {
display: none !important; display: none !important;
} }
.navigation .navbar-nav, .main-navigation {
.navigation .navbar-nav > li { padding: 0;
float: none; margin: 0;
} list-style: none;
}
.navigation .nav > li.active > a, .main-navigation a {
.navigation .nav > li > a:hover,
.navigation .nav > li > a:focus {
background: none;
color: #F0FAFF;
}
.navbar-nav > li > a {
padding: 0 15px; padding: 0 15px;
height: 48px; height: 48px;
color: rgba(240, 250, 255, .25); color: rgba(240, 250, 255, .25);
border-bottom: 1px solid rgba(240, 250, 255, .05); border-bottom: 1px solid rgba(240, 250, 255, .05);
text-decoration: none;
} }
.navigation .nav > li.active > a { .main-navigation > li.active > a,
.main-navigation > li > a:hover,
.main-navigation > li > a:focus {
background: none;
color: #F0FAFF;
}
.main-navigation > li.active > a .icon,
.main-navigation > li > a:hover .icon,
.main-navigation > li > a:focus .icon {
opacity: 1;
}
.main-navigation li.active > a {
background: #389ed9; background: #389ed9;
} }
@ -1441,12 +1449,6 @@ footer {
vertical-align: bottom; vertical-align: bottom;
} }
.navigation .nav > li.active > a .icon,
.navigation .nav > li > a:hover .icon,
.navigation .nav > li > a:focus .icon {
opacity: 1;
}
.tasks { .tasks {
background: #2c2d36; background: #2c2d36;
overflow: auto; overflow: auto;