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

6 files changed, 97 insertions, 3 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e3ff6146b..ee106d50e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1669,8 +1669,8 @@ nav .dropdown-menu {
 
 main.fullscreen {
 	left: 0px;
-	width: 100%;
-	height: 100%;
+	width: 100vw;
+	height: 100vh;
 	max-width: none;
 }
 
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 395385411..185dc7bcd 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -30,6 +30,15 @@ $(document).ready(function() {
 		}
 	});
 
+	var left_aside_height = $('#left_aside_wrapper').height();
+
+	$('#left_aside_wrapper').on('click', function() {
+		if(left_aside_height != $('#left_aside_wrapper').height()) {
+			$(document.body).trigger("sticky_kit:recalc");
+			left_aside_height = $('#left_aside_wrapper').height();
+		}
+	});
+
 	if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) {
 		$('#expand-aside').hide();
 	}
@@ -96,7 +105,7 @@ function toggleAside() {
 		$('main').addClass('region_1-on')
 		$('<div id="overlay"></div>').appendTo('section');
 		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: $('nav').outerHeight(true)
+			offset_top: $('nav').outerHeight(true) - 10
 		});
 	}
 }
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index ed2714dfc..f9114141d 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -433,3 +433,26 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #222;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #222;
+}
+
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index 7dd8125a4..f06fd3667 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -297,3 +297,24 @@ pre {
 	top: 50px;
 
 }
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #F5F5F5;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #F5F5F5;
+}
+
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index ca2e5b15a..c7bb99334 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -383,3 +383,23 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #143D12;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #143D12;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index a462c4d29..dabc26743 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -356,3 +356,24 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #030303;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #030303;
+}
+