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

view/theme/redbasic/css/narrow_navbar.css

@@ -11,7 +11,7 @@
 	}
 
 	.contextual-help-content-open {
-		top: 2.4rem;
+		top: 2.5rem;
 	}
 
 	aside {

view/theme/redbasic/css/style.css

@@ -191,7 +191,7 @@ nav {
 .contextual-help-content-open {
 	display: block;
 	position: fixed;
-	top: 3.25rem;
+	top: 3.35rem;
 	left: 0px;
 	width: 100%;
 	max-height: 50%;
@@ -1211,12 +1211,12 @@ a.active:hover .dropdown-sub-text {
 }
 
 .usermenu {
-	width: 3.5rem;
+	width: 3.75rem;
 }
 
 #avatar {
-	width: 2.2rem;
-	height: 2.2rem;
+	width: 2.35rem;
+	height: 2.35rem;
 	border-radius: $radius;
 }
 

view/theme/redbasic/js/redbasic.js

@@ -3,6 +3,13 @@
  */
 $(document).ready(function() {
 
+	//this is a hotfix to make collapsible bs panels work again. this needs fixing in bootstrap. 
+	$('a').on('click', function(e) {
+		if($(this).data('toggle') == 'collapse') {
+			e.preventDefault();
+		}
+	});
+
 	// CSS3 calc() fallback (for unsupported browsers)
 	$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
 	if( $('#css3-calc').width() == 10) {