4 files changed, 19 insertions, 13 deletions
diff --git a/include/widgets.php b/include/widgets.php
index 50e4cb184..cb68ed00f 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -811,7 +811,7 @@ function widget_chatroom_list($arr) {
 
 function widget_chatroom_members() {
 	$o = replace_macros(get_markup_template('chatroom_members.tpl'), array(
-		'$header' => t('Chatroom Members')
+		'$header' => t('Chat Members')
 	));
 
 	return $o;
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index 9d46d9860..75e858542 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -33,7 +33,6 @@ aside {
 #chatTopBar {
 	float: left;
 	width: 100%;
-	height: 400px;
 	overflow-y: auto;
 }
 
@@ -115,6 +114,10 @@ aside {
 	height: 100%;
 	top: 0px;
 	left: 0px;
+	border-radius: 0px;
 	z-index: 10000;
 }
 
+.generic-content-wrapper.fullscreen .section-title-wrapper {
+	border-radius: 0px;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 43607a95c..443f96da9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1375,6 +1375,10 @@ img.mail-conv-sender-photo {
 	background-color: $item_colour;
 }
 
+#chatMembers img {
+	border-radius: $radiuspx;
+}
+
 /* nav bootstrap */
 
 
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index b18318044..1001f28b3 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -30,8 +30,8 @@
 				<div class="form-group">
 
 				</div>
-				<div id="chat-submit-wrapper" class="form-group">
-					<div id="chat-submit" class="btn-group dropup pull-right">
+				<div id="chat-submit-wrapper">
+					<div id="chat-submit" class="dropup pull-right">
 						<button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="icon-caret-down"></i></button>
 						<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
 						<ul class="dropdown-menu">
@@ -109,14 +109,13 @@ $(document).ready(function() {
 	chat_timer = setTimeout(load_chats,300);
 	$('#chatroom_bookmarks, #vcard').hide();
 	$('#chatroom_list, #chatroom_members').show();
-
-	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 40 );
-
+	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23 );
 });
 
 $(window).resize(function () {
-	var navHeight = $('.generic-content-wrapper').hasClass('fullscreen') ? 0 : $('nav').outerHeight(true)
-	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - navHeight - 40 );
+	var navHeight = $('.generic-content-wrapper').hasClass('fullscreen') ? 0 : $('nav').outerHeight(true);
+	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - navHeight - 23);
+	$('#chatTopBar').scrollTop($('#chatTopBar').scrollTop() + $('#chatTopBar').outerHeight(true));
 });
 
 $('#chat-form').submit(function(ev) {
@@ -196,18 +195,18 @@ function addmailtext(data) {
 }
 
 function makeFullScreen() {
-	$('#fullscreen').hide();
+	$('#fullscreen, aside').hide();
 	$('#inline').show();
 	$('.generic-content-wrapper').addClass('fullscreen');
-	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 20);
+	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23);
 
 }
 
 function makeInline() {
-	$('#fullscreen').show();
+	$('#fullscreen, aside').show();
 	$('#inline').hide();
 	$('.generic-content-wrapper').removeClass('fullscreen');
-	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 40 );
+	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
 }
 
 </script>