3 files changed, 42 insertions, 20 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 30b0cebb4..6cc3e2f10 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1136,18 +1136,31 @@ margin-right: 50px;
 	list-style-type: none;
 }
 
+.generic-icons {
+	font-size: 1.2em;
+	color: $toolicon_colour;
+	margin-right: 7px;
+}
+
+.generic-icons:hover {
+	color: $toolicon_colour;
+}
+
 .admin-icons {
 	font-size: 1.2em;
 	color: $toolicon_colour;
-	margin-right: 10px;
+	margin-right: 7px;
 }
 
+.drop-icons,
 a .drop-icons {
 	color: $toolicon_colour;
 	font-size: 1.2em;
 	text-decoration: none;
+	cursor: pointer;
 }
- 
+
+.drop-icons:hover,
 a .drop-icons:hover {
 	color: #FF0000;
 }
@@ -1403,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 {
@@ -1645,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,
@@ -2020,3 +2031,13 @@ dl.bb-dl > dd > li {
 .help-searchlist a {
 	font-size: 130%;
 }
+
+.embed-photo-selected-photo {
+    border-color: blue;
+    border-style: solid;
+    border-width: 5px;
+}
+
+#wiki-preview img {
+    max-width: 100%;
+}
\ No newline at end of file
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 58c2a9ceb..999b46268 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -56,13 +56,14 @@ $(document).ready(function() {
 function makeFullScreen(full) {
 	if(typeof full=='undefined' || full == true) {
 		$('main').css({'transition': 'none'}).addClass('fullscreen');
-		$('#fullscreen-btn, header, nav, aside').css({'display': 'none'});
+		$('header, nav, aside, #fullscreen-btn').hide();
+		$('#tabs-collapse-1').css({'visibility': 'hidden'});
 		$('#inline-btn').show();
-
 	}
 	else {
 		$('main').removeClass('fullscreen');
-		$('#fullscreen-btn, header, nav, aside').css({'display': ''});
+		$('header, nav, aside, #fullscreen-btn').show();
+		$('#tabs-collapse-1').css({'visibility': ''});
 		$('#inline-btn').hide();
 		$('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')