From c1b92d9acff9c69aab2f43502ffd7cadac5491e4 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Fri, 27 Sep 2013 10:06:35 -0300
Subject: [PATCH] Fixing chat styles

---
 TODO.rst                  |  5 +++++
 src/static/css/screen.css | 20 ++++++++++++++------
 src/templates/base.html   | 13 ++++++++-----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/TODO.rst b/TODO.rst
index ac6f329..5475213 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -6,6 +6,11 @@ Planet
 
 * Paginator esta quebrado em telas xs
 
+Chat
+====
+
+* Allow user to change passwords
+
 
 Outros
 =======
diff --git a/src/static/css/screen.css b/src/static/css/screen.css
index 24bbb2e..b7a7111 100644
--- a/src/static/css/screen.css
+++ b/src/static/css/screen.css
@@ -251,7 +251,8 @@ ul.unstyled-list .glyphicon-chevron-right {
     padding: 0;
 }
 
-#chatpanel form#converse-login input, #chatpanel form#converse-login label {
+#chatpanel form#converse-login input,
+#chatpanel form#converse-login label {
     margin: 2px 10px;
 }
 
@@ -259,10 +260,10 @@ ul.unstyled-list .glyphicon-chevron-right {
     margin-top: 10px;
 }
 
-#chatpanel a.configure-chatroom-button, #chatpanel a.close-chatbox-button {
+#chatpanel a.configure-chatroom-button,
+#chatpanel a.close-chatbox-button {
     background-color: #F6F6F6;
     margin-right: 0.6em;
-    width: 22px;
 }
 
 #chatpanel .chat-head #controlbox-tabs li {
@@ -283,7 +284,7 @@ ul.unstyled-list .glyphicon-chevron-right {
 
 #chatpanel #toggle-controlbox {
     font-size: 100% !important;
-    padding: 0 4px 23px !important;
+    padding: 0 4px 26px !important;
 }
 
 #chatpanel {
@@ -313,9 +314,16 @@ ul.unstyled-list .glyphicon-chevron-right {
     max-width: 189px;
 }
 
-#chatpanel .chat-content, #chatpanel .chatroom .participants{
-    border: none;
+#chatpanel .chat-content,
+#chatpanel .chatroom .participants{
+    width: auto;
+}
+
+#chatpanel div#chatrooms {
+    overflow-y: visible;
 }
+
+
 /* End of Converse JS*/
 
 
diff --git a/src/templates/base.html b/src/templates/base.html
index a190990..e1fa9ec 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -6,12 +6,15 @@
 
     <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.css" type="text/css" media="screen, projection" />
 
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
-                                type="text/css" media="screen" charset="utf-8"/>
     <link rel="stylesheet"
           href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css"
           type="text/css" media="screen" charset="utf-8"/>
 
+    {% conversejs_static %}
+
+    <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
+                                type="text/css" media="screen" charset="utf-8"/>
+
     <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script>
@@ -19,8 +22,6 @@
 
     <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script>
 
-    {% conversejs_static %}
-
 
     {% block head_js %}{% endblock %}
     {% block head_css %}{% endblock %}
@@ -155,7 +156,9 @@
       {% endblock %}
     </div>
 
-  {% conversejs_chatpanel %}
+  <div class="visible-lg">
+    {% conversejs_chatpanel %}
+  </div>
   {% conversejs_initialize %}
 
   {% browserid_js %}
--
libgit2 0.21.2