harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close the apps-menu if the notifications-menu is open and vice versa

Browse Source
This commit is contained in:
git-marijus
2017-07-29 16:06:42 +02:00
parent 11cdd0033d
commit 280f52f007
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view/js/main.js
View File

@@ -375,7 +375,7 @@ function NavUpdate() {
} }
else { else {
$('#notifications-btn').css('opacity', 0.5); $('#notifications-btn').css('opacity', 0.5);
$('#navbar-collapse-1').removeClass('in'); $('#navbar-collapse-1').removeClass('show');
} }
if(data.network == 0) { if(data.network == 0) {

12
view/theme/redbasic/js/redbasic.js
View File

@@ -54,6 +54,18 @@ $(document).ready(function() {
} }
}); });
$('#menu-btn').click(function() {
if($('#navbar-collapse-1').hasClass('show')){
$('#navbar-collapse-1').removeClass('show');
}
});
$('#notifications-btn').click(function() {
if($('#navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-2').removeClass('show');
}
});
$("input[data-role=cat-tagsinput]").tagsinput({ $("input[data-role=cat-tagsinput]").tagsinput({
tagClass: 'badge badge-pill badge-warning text-dark' tagClass: 'badge badge-pill badge-warning text-dark'
}); });

2
view/tpl/nav.tpl
View File

@@ -68,7 +68,7 @@
<i class="fa fa-exclamation-circle"></i> <i class="fa fa-exclamation-circle"></i>
</button> </button>
{{/if}} {{/if}}
<button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> <button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
<i class="fa fa-bars"></i> <i class="fa fa-bars"></i>
</button> </button>
</div> </div>