Merge branch 'dev' into perms

3 files changed, 17 insertions, 20 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5768ccbd9..d61e60dc9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1416,9 +1416,6 @@ img.mail-conv-sender-photo {
 	display: block;
 	border-top: 1px dashed #ccc;
 	text-align: center;
-	font-size: $body_font_size;
-	color: $link_colour;
-	cursor: pointer;	
 }
 
 .divgrow-showmore:hover {
@@ -1658,6 +1655,7 @@ main.fullscreen .section-content-wrapper-np {
 	display: none;
 }
 
+.atoken-index-row:hover td,
 .chatroom-index-row:hover td,
 .locs-index-row:hover td,
 [id^="cloud-index-"]:hover td,
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 300f076f0..999b46268 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -56,16 +56,15 @@ $(document).ready(function() {
 function makeFullScreen(full) {
 	if(typeof full=='undefined' || full == true) {
 		$('main').css({'transition': 'none'}).addClass('fullscreen');
-		$('header, nav, aside, #tabs-collapse-1').css({'visibility': 'hidden'});
-		$('#fullscreen-btn').hide();
+		$('header, nav, aside, #fullscreen-btn').hide();
+		$('#tabs-collapse-1').css({'visibility': 'hidden'});
 		$('#inline-btn').show();
-
 	}
 	else {
 		$('main').removeClass('fullscreen');
-		$('header, nav, aside, #tabs-collapse-1').css({'visibility': ''});
+		$('header, nav, aside, #fullscreen-btn').show();
+		$('#tabs-collapse-1').css({'visibility': ''});
 		$('#inline-btn').hide();
-		$('#fullscreen-btn').show();
 		$('main').css({'transition': ''});
 	}
 }
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 83c35935a..2db0d4c44 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -153,6 +153,18 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 	$x = file_get_contents('view/theme/redbasic/css/style.css');
 
+	if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
+		$x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
+	}
+
+	if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
+		$x .= file_get_contents('view/theme/redbasic/css/align_left.css');
+	}
+
+	if($schemecss) {
+		$x .= $schemecss;
+	}
+
 	$aside_width = 287;
 
 	// left aside and right aside are 285px + converse width
@@ -204,18 +216,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 }
 
-if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
-	echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
-} 
-
-if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
-	echo file_get_contents('view/theme/redbasic/css/align_left.css');
-}
-
-if($schemecss) {
-	echo $schemecss;
-}
-
 // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. 
 
 if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')