From fbb70cd46c83603118705ed879c6bac41808f2f8 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Thu, 19 Jun 2014 21:52:51 +0200
Subject: [PATCH] Improvided chat list.

---
 src/styles/components/_chat.scss | 15 +++++++++------
 static/partials/chat.html        | 14 +++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/styles/components/_chat.scss b/src/styles/components/_chat.scss
index 6d34f46b..27e8041b 100644
--- a/src/styles/components/_chat.scss
+++ b/src/styles/components/_chat.scss
@@ -86,15 +86,17 @@
     border-right: none;
     border-left: none;
     border-radius: 0;
-    padding-right: 30px;
+    padding-right: 70px;
     position: relative;
+    min-height: 51px;
+    line-height: 26px;
     &.newmessage {
       animation: newmessage 1s ease -0.3s infinite;
     }
     &.disabled {
       color: $chat-disabled;
     }
-    &:hover .item-btn {
+    &:hover button {
       display: inline;
     }
     .fa-lg {
@@ -105,13 +107,14 @@
     .badge {
       background: $chat-badge;
       border: 1px solid white;
-      font-size: .8em;
+      position: absolute;
+      right: 50px;
+      top: 14px;
     }
-    .item-btn {
-      cursor: pointer;
+    button {
       display: none;
       position: absolute;
-      right: 12px;
+      right: 10px;
     }
   }
 }
diff --git a/static/partials/chat.html b/static/partials/chat.html
index 02b97677..bd850c32 100644
--- a/static/partials/chat.html
+++ b/static/partials/chat.html
@@ -5,13 +5,13 @@
 			<div class="chatheader"><div class="chatstatusicon" ng-click="activateRoom(currentRoom.id, true)"><i class="fa fa-angle-right"></i> <i class="fa fa fa-comments-o"></i></div><div class="chatheadertitle"><span>{{_("Chat sessions")}}</span></div> <div class="ctrl"><i ng-show="layout.chatMaximized" ng-click="toggleMax()" class="fa fa-compress"></i></div></div>
 			<div class="chatbody">
 				<div class="list-group nicescroll">
-				  <a ng-if="roomstatus" ng-click="activateRoom('', true)" class="list-group-item" ng-class="{newmessage: getGroupRoom().pending}">
-				  		<span class="badge" ng-show="getGroupRoom().pending">{{getGroupRoom().pending}}</span>
-				    <i class="fa fa-users fa-lg"></i> {{_("Room chat")}} {{roomid}}
-				  </a>
-				  <a ng-repeat="room in getVisibleRooms()" ng-click="activateRoom(room.id, true)" class="list-group-item" ng-class="{newmessage: room.pending, disabled: !room.enabled}">
-				  	<span class="badge" ng-show="room.pending">{{room.pending}}</span><i class="fa fa-user fa-lg"></i> {{room.id|displayName}} <span ng-click="hideRoom(room.id)" class="item-btn fa fa-trash-o"></span>
-				  </a>
+					<a ng-if="roomstatus" ng-click="activateRoom('', true)" class="list-group-item" ng-class="{newmessage: getGroupRoom().pending}">
+						<span class="badge" ng-show="getGroupRoom().pending">{{getGroupRoom().pending}}</span>
+						<i class="fa fa-users fa-lg"></i> {{_("Room chat")}} {{roomid}}
+					</a>
+					<a ng-repeat="room in getVisibleRooms()" ng-click="activateRoom(room.id, true)" class="list-group-item" ng-class="{newmessage: room.pending, disabled: !room.enabled}">
+						<span class="badge" ng-show="room.pending">{{room.pending}}</span><i class="fa fa-user fa-lg"></i> {{room.id|displayName}} <button class="btn btn-sm btn-default" ng-click="hideRoom(room.id)"><i class="fa fa-trash-o"></i></button>
+					</a>
 				</div>
 			</div>
 		</div>