3 files changed, 44 insertions, 19 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3ae52d5cc..c66b040a4 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -22,6 +22,8 @@ body {
 	color: $font_colour;
 	margin: 0px;
 	height: 100%;
+	overflow-x: hidden;
+	
 }
 
 aside {
@@ -30,6 +32,10 @@ aside {
 	max-width: $aside_widthpx;
 }
 
+aside#region_1 {
+	border-right: 1px solid transparent;
+}
+
 main {
 	margin-left: auto;
 	margin-right: auto;
@@ -473,7 +479,6 @@ footer {
 
 #contact-block {
 	width: 100%;
-	float: left;
 }
 
 #contact-block-numcontacts {
@@ -482,12 +487,10 @@ footer {
 }
 
 .contact-block-div {
-	float: left;
-	width: 50px;
-	height: 50px;
+	display: inline;
 }
+
 .contact-block-textdiv {
-	float: left;
 	width: 150px;
 	height: 34px;
 }
@@ -495,12 +498,11 @@ footer {
 #contact-block-end {
 	clear: both;
 }
-.contact-block-link {
-	float: left;
-}
+
 .contact-block-img {
-	width:48px;
-	height:48px;
+	width:47px;
+	height:47px;
+	margin-bottom: 3px;
 }
 
 #tag-remove {
@@ -1267,6 +1269,11 @@ img.mail-conv-sender-photo {
 	color: $toolicon_colour;
 }
 
+.jot-icons.jot-lock-warn {
+	color: darkorange;
+}
+
+
 /* conversation */
 .nsfw-wrap {
 	text-align: center;
@@ -1838,10 +1845,6 @@ nav .badge.mail-update:hover {
 	}
 
 	main {
-		transition: all 0.25s ease-in-out;
-	}
-
-	main {
 		left: -$aside_widthpx;
 		width: calc( 100% + $aside_widthpx );
 	}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c5f74db3f..4a18db8ff 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -8,17 +8,32 @@ $(document).ready(function() {
 	if( $('#css3-calc').width() == 10) {
 		$(window).resize(function() {
 			if($(window).width() < 767) {
-				$('main').css('width', $(window).width() + 287 );
+				$('main').css('width', $(window).width() + $('aside').outerWidth() );
 			} else {
 				$('main').css('width', '100%' );
 			}
 		});
 	}
+
 	$('#css3-calc').remove(); // Remove the test element
 
-	$('#expand-aside').click(function() {
-		$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
-		$('main').toggleClass('region_1-on');
+	$('#left_aside_wrapper').stick_in_parent({
+		offset_top: $('nav').outerHeight(true)
+	});
+
+	$('#expand-aside').on('click', toggleAside);
+
+	$('section').on('click', function() {
+		if($('main').hasClass('region_1-on')){
+			toggleAside();
+		}
+	});
+
+	$(window).on('scroll', function() {
+		if($('main').hasClass('region_1-on') && $(window).scrollLeft() > 5){
+			$(window).scrollLeft(0);
+			toggleAside();
+		}
 	});
 
 	if($('aside').length && $('aside').html().length === 0) {
@@ -72,5 +87,12 @@ function makeFullScreen(full) {
 		$('#tabs-collapse-1').css({'visibility': ''});
 		$('#inline-btn').hide();
 		$('main').css({'transition': ''});
+		$(document.body).trigger("sticky_kit:recalc");
 	}
 }
+
+function toggleAside() {
+	$(window).scroll();
+	$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
+	$('main').toggleClass('region_1-on');
+}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 2db0d4c44..9b994ebdf 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -165,7 +165,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		$x .= $schemecss;
 	}
 
-	$aside_width = 287;
+	$aside_width = 288;
 
 	// left aside and right aside are 285px + converse width
 	if($align_left) {