Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

This commit is contained in:
zotlabs 2016-11-05 03:33:35 -07:00
commit b326ab78b3
2 changed files with 11 additions and 1 deletions

View file

@ -1515,7 +1515,11 @@ nav .dropdown-menu {
color: $nav_icon_colour;
}
#avatar:hover + #usermenu-caret {
.usermenu-head {
float: left;
}
.usermenu-head:hover #usermenu-caret {
color: $nav_active_icon_colour;
}

View file

@ -32,6 +32,12 @@ $(document).ready(function() {
$('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up');
});
$('.usermenu-head').click(function() {
if($('#navbar-collapse-1').hasClass('in')){
$('#navbar-collapse-1').removeClass('in');
}
});
if($('#tabs-collapse-1').length === 0) {
$('#expand-tabs').hide();
}