4 files changed, 62 insertions, 11 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6ef9ea284..903900e7f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1263,7 +1263,9 @@ img.mail-conv-sender-photo {
 
 .wall-item-content,
 .mail-conv-body,
-.page-body {
+.page-body,
+.chat-item-text,
+.chat-item-text-self {
 	font-size: $font_size;
 	clear: both;
 }
@@ -1362,13 +1364,19 @@ img.mail-conv-sender-photo {
 	cursor: pointer;
 }
 
-.chat-item-photo {
+.chat-item-photo,
+.chat-item-photo-self {
 	border-radius: $radiuspx;
 }
 
-.chat-item-text {
+.chat-item-title,
+.chat-item-title-self {
+	border-radius: $radiuspx;
+	background-color: $item_colour;
+}
+
+#chatMembers img {
 	border-radius: $radiuspx;
-	background-color: #eee;
 }
 
 /* nav bootstrap */
@@ -1510,6 +1518,36 @@ nav .dropdown-menu {
 	word-wrap: break-word;
 }
 
+main.fullscreen {
+	left: 0px;
+	width: 100%;
+	height: 100%;
+	max-width: none;
+}
+
+main.fullscreen .generic-content-wrapper {
+	position: absolute;
+	width: 100%;
+	top: 0px;
+	left: 0px;
+	border-radius: 0px;
+}
+
+main.fullscreen .section-title-wrapper {
+	border-radius: 0px;
+}
+
+main.fullscreen .section-content-wrapper,
+main.fullscreen .section-content-wrapper-np {
+	border-radius: 0px;
+}
+
+#inline-btn {
+	display: none;
+}
+
+.chatroom-index-row:hover td,
+.locs-index-row:hover td,
 [id^="cloud-index-"]:hover td,
 .cloud-index-active {
 	background-color: $item_colour;
@@ -1691,9 +1729,7 @@ nav .badge.mail-update:hover {
 	}
 
 	main {
-		-webkit-transition: all 0.25s ease-out;
-		-moz-transition: all 0.25s ease-out;
-		transition: all 0.25s ease-out;
+		transition: all 0.25s ease-in-out;
 	}
 
 	main {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index a4e13b8eb..877bcd840 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -52,3 +52,18 @@ $(document).ready(function() {
 	}
 	setInterval(function () {checkNotify();}, 10 * 1000);
 });
+
+function makeFullScreen(full) {
+	if(typeof full=='undefined' || full == true) {
+		$('main').css({'transition': 'none'}).addClass('fullscreen');
+		$('#fullscreen-btn, header, nav, aside').css({'display': 'none'});
+		$('#inline-btn').show();
+
+	}
+	else {
+		$('main').removeClass('fullscreen');
+		$('#fullscreen-btn, header, nav, aside').css({'display': ''});
+		$('#inline-btn').hide();
+		$('main').css({'transition': ''});
+	}
+}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 66597332c..04cf4f904 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -97,8 +97,8 @@ if(feature_enabled(local_channel(),'expert'))
 	  $t = get_markup_template('theme_settings.tpl');
 	  $o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$theme' => $a->channel['channel_theme'],
+		'$baseurl' => z_root(),
+		'$theme' => App::$channel['channel_theme'],
 		'$expert' => $expert,
 		'$title' => t("Theme settings"),
 		'$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 6058a3c14..83c35935a 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,6 +1,6 @@
 <?php
 
-if(! $a->install) {
+if(! App::$install) {
 
 	// Get the UID of the channel owner
 	$uid = get_theme_uid();
@@ -218,5 +218,5 @@ if($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() && $a->channel && $a->channel['channel_theme'] != 'redbasic')
+if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')
 	set_pconfig(local_channel(), 'redbasic', 'schema', '---');