From 8ac32cf4d60d1e0bf6e8afd81b37cb3503063140 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 3 Nov 2016 21:01:18 -0400 Subject: Collapse navbar-collapse-1 if avatar menu is clicked. --- view/theme/redbasic/js/redbasic.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 999b46268..bdd6441f8 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -32,6 +32,12 @@ $(document).ready(function() { $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); + $('#avatar').click(function() { + if($('#navbar-collapse-1').hasClass('in')){ + $('#navbar-collapse-1').removeClass('in'); + } + }); + if($('#tabs-collapse-1').length === 0) { $('#expand-tabs').hide(); } -- cgit v1.2.3 From 471d88c1d2708de8d5ef9bc5923b62c4084046e4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 Nov 2016 21:29:23 +0100 Subject: some fixes for the recent changes in the personal menu dropdown --- view/theme/redbasic/css/style.css | 6 +++++- view/theme/redbasic/js/redbasic.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a6d1d2a7e..a7ce3af38 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index bdd6441f8..c5f74db3f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -32,7 +32,7 @@ $(document).ready(function() { $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); - $('#avatar').click(function() { + $('.usermenu-head').click(function() { if($('#navbar-collapse-1').hasClass('in')){ $('#navbar-collapse-1').removeClass('in'); } -- cgit v1.2.3