mirror of
https://github.com/NaN-tic/sao-old.git
synced 2023-12-14 02:12:52 +01:00
Compute toolbar offset using navtabs parent
Since changeset f298a41cd811 navbar height is no more valid when the list of tabs overflows issue6292 review28031002
This commit is contained in:
parent
6066e0b2c6
commit
23414e02e6
2 changed files with 4 additions and 4 deletions
|
@ -42,7 +42,7 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed"
|
||||
data-toggle="collapse" data-target="#user_menu_collapse">
|
||||
data-toggle="collapse" data-target="#main_navbar">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
|
@ -55,7 +55,7 @@ this repository contains the full copyright notices and license terms. -->
|
|||
</button>
|
||||
</p>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse" id="user_menu_collapse">
|
||||
<div class="collapse navbar-collapse" id="main_navbar">
|
||||
<ul class="nav navbar-nav">
|
||||
<li id="user-preferences"></li>
|
||||
<li id="user-favorites"></li>
|
||||
|
|
|
@ -128,12 +128,12 @@
|
|||
'target': tabs.parent(),
|
||||
'offset': {
|
||||
'top': function() {
|
||||
return tabs.find('.nav-tabs').height();
|
||||
return jQuery('#main_navbar').height();
|
||||
}
|
||||
}
|
||||
});
|
||||
toolbar.on('affix.bs.affix', function() {
|
||||
wrapper.height(toolbar.height());
|
||||
wrapper.height(jQuery('#main_navbar').height());
|
||||
});
|
||||
toolbar.on('affix-top.bs.affix affix-bottom.bs.affix',
|
||||
function() {
|
||||
|
|
Loading…
Reference in a new issue