From fcd34e41cafaa77c9d9d46ff60d73c78866fe52a Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 30 Dec 2016 13:35:43 +0100
Subject: css fixes and get rid of a javascript workaround

---
 view/css/default.css               | 4 ++--
 view/theme/redbasic/css/style.css  | 3 +--
 view/theme/redbasic/js/redbasic.js | 7 -------
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'view')

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/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();
 	}
-- 
cgit v1.2.3