aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-05 03:33:35 -0700
committerzotlabs <mike@macgirvin.com>2016-11-05 03:33:35 -0700
commitb326ab78b30367a3c2d8c97b8335a58b3b37e226 (patch)
tree5a35b880e2fea73a6eff90bb89be3903b29d7bef
parent8811ca9e9efc8e177a49702066402fae819bdf5b (diff)
parent471d88c1d2708de8d5ef9bc5923b62c4084046e4 (diff)
downloadvolse-hubzilla-b326ab78b30367a3c2d8c97b8335a58b3b37e226.tar.gz
volse-hubzilla-b326ab78b30367a3c2d8c97b8335a58b3b37e226.tar.bz2
volse-hubzilla-b326ab78b30367a3c2d8c97b8335a58b3b37e226.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--view/theme/redbasic/css/style.css6
-rw-r--r--view/theme/redbasic/js/redbasic.js6
2 files changed, 11 insertions, 1 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 999b46268..c5f74db3f 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');
});
+ $('.usermenu-head').click(function() {
+ if($('#navbar-collapse-1').hasClass('in')){
+ $('#navbar-collapse-1').removeClass('in');
+ }
+ });
+
if($('#tabs-collapse-1').length === 0) {
$('#expand-tabs').hide();
}