Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge

5 files changed, 6 insertions, 14 deletions

diff --git a/boot.php b/boot.php
index ab73a9862..ecd34af1e 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ require_once('include/zid.php');
 
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '2.0.1' );
+define ( 'STD_VERSION',             '2.0.2' );
 define ( 'ZOT_REVISION',            '1.2' );
 
 define ( 'DB_UPDATE_VERSION',       1185  );
diff --git a/view/css/default.css b/view/css/default.css
index 67a411d6e..d9bea7b41 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -10,8 +10,8 @@ main {
 	display: table;
 	table-layout: fixed;
 	position: relative;
-	width: 100%;
-	height: 100%;
+	width: 100vw;
+	height: 100vh;
 }
 
 aside {
diff --git a/view/js/main.js b/view/js/main.js
index a6164e602..01d562d1d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -434,12 +434,12 @@ function contextualHelp() {
 
 	if(container.hasClass('contextual-help-content-open')) {
 		container.removeClass('contextual-help-content-open');
-		$('main').css('top', '')
+		$('main').css('margin-top', '')
 	}
 	else {
 		container.addClass('contextual-help-content-open');
 		var mainTop = container.outerHeight(true);
-		$('main').css('top', mainTop + 'px');
+		$('main').css('margin-top', mainTop + 'px');
 	}
 }
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7254be552..b300c5f2e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -8,8 +8,8 @@
 
 /* generals */
 html {
-	height: 100%;
 	font-size: 100%;
+	overflow-x: hidden;
 }
 
 body {
@@ -21,7 +21,6 @@ body {
 	background-size: cover;
 	color: $font_colour;
 	margin: 0px;
-	height: 100%;
 	overflow-x: hidden;
 }
 
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index e31458b4e..b7993ce90 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -30,13 +30,6 @@ $(document).ready(function() {
 		}
 	});
 
-	$(window).on('scroll', function() {
-		if($('main').hasClass('region_1-on') && $(window).scrollLeft() > 5){
-			$(window).scrollLeft(0);
-			toggleAside();
-		}
-	});
-
 	if($('aside').length && $('aside').html().length === 0) {
 		$('#expand-aside').hide();
 	}