Merge branch 'master' into dev

3 files changed, 16 insertions, 17 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9a365d8a7..903900e7f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1518,7 +1518,14 @@ nav .dropdown-menu {
 	word-wrap: break-word;
 }
 
-.generic-content-wrapper.fullscreen {
+main.fullscreen {
+	left: 0px;
+	width: 100%;
+	height: 100%;
+	max-width: none;
+}
+
+main.fullscreen .generic-content-wrapper {
 	position: absolute;
 	width: 100%;
 	top: 0px;
@@ -1526,11 +1533,12 @@ nav .dropdown-menu {
 	border-radius: 0px;
 }
 
-.generic-content-wrapper.fullscreen .section-title-wrapper {
+main.fullscreen .section-title-wrapper {
 	border-radius: 0px;
 }
 
-.generic-content-wrapper.fullscreen .section-content-wrapper {
+main.fullscreen .section-content-wrapper,
+main.fullscreen .section-content-wrapper-np {
 	border-radius: 0px;
 }
 
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 73628ebd9..877bcd840 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -55,15 +55,13 @@ $(document).ready(function() {
 
 function makeFullScreen(full) {
 	if(typeof full=='undefined' || full == true) {
-		$('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'});
-		$('.generic-content-wrapper').addClass('fullscreen');
+		$('main').css({'transition': 'none'}).addClass('fullscreen');
 		$('#fullscreen-btn, header, nav, aside').css({'display': 'none'});
 		$('#inline-btn').show();
 
 	}
 	else {
-		$('main').css({'left': '', 'width': '', 'max-width': ''});
-		$('.generic-content-wrapper').removeClass('fullscreen');
+		$('main').removeClass('fullscreen');
 		$('#fullscreen-btn, header, nav, aside').css({'display': ''});
 		$('#inline-btn').hide();
 		$('main').css({'transition': ''});
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 19b025820..9cf5968cb 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -18,17 +18,12 @@
 		<div id="chatTopBar">
 			<div id="chatLineHolder"></div>
 		</div>
-
-
 		<div class="clear"></div>
-
 		<div id="chatBottomBar" >
-			<div class="tip"></div>
 			<form id="chat-form" method="post" action="#">
 				<input type="hidden" name="room_id" value="{{$room_id}}" />
-					<textarea id="chatText" name="chat_text" class="form-control"></textarea>
 				<div class="form-group">
-
+					<textarea id="chatText" name="chat_text" class="form-control"></textarea>
 				</div>
 				<div id="chat-submit-wrapper">
 					<div id="chat-submit" class="dropup pull-right">
@@ -65,7 +60,7 @@
 						<div class="btn-group hidden-xs">
 							<button id="chat-link-wrapper" class="btn btn-default btn-sm" onclick="chatJotGetLink(); return false;" >
 								<i id="chat-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
-							</button-->
+							</button>
 						</div>
 						{{if $feature_encrypt}}
 						<div class="btn-group hidden-xs">
@@ -86,8 +81,6 @@
 								{{/if}}
 							</ul>
 						</div>
-
-
 					</div>
 					<div id="chat-rotator-wrapper" class="pull-left">
 						<div id="chat-rotator"></div>
@@ -113,7 +106,7 @@ $(document).ready(function() {
 });
 
 $(window).resize(function () {
-	if($('.generic-content-wrapper').hasClass('fullscreen')) {
+	if($('main').hasClass('fullscreen')) {
 		adjustFullscreenTopBarHeight();
 	}
 	else {