Fixing chat styles

Sergio Oliveira
1 parent 440eb406
Showing 3 changed files with 27 additions and 11 deletions Show diff stats
TODO.rst
src/static/css/screen.css
src/templates/base.html
@@ -6,6 +6,11 @@ Planet
  
 * Paginator esta quebrado em telas xs
  
+Chat
+====
+
+* Allow user to change passwords
+
  
 Outros
 =======
@@ -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*/
  
  
@@ -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 %}
...	...	@@ -6,6 +6,11 @@ Planet
6	6
7	7	* Paginator esta quebrado em telas xs
8	8
	9	+Chat
	10	+====
	11	+
	12	+* Allow user to change passwords
	13	+
9	14
10	15	Outros
11	16	=======
...	...
...	...	@@ -251,7 +251,8 @@ ul.unstyled-list .glyphicon-chevron-right {
251	251	padding: 0;
252	252	}
253	253
254		-#chatpanel form#converse-login input, #chatpanel form#converse-login label {
	254	+#chatpanel form#converse-login input,
	255	+#chatpanel form#converse-login label {
255	256	margin: 2px 10px;
256	257	}
257	258
...	...	@@ -259,10 +260,10 @@ ul.unstyled-list .glyphicon-chevron-right {
259	260	margin-top: 10px;
260	261	}
261	262
262		-#chatpanel a.configure-chatroom-button, #chatpanel a.close-chatbox-button {
	263	+#chatpanel a.configure-chatroom-button,
	264	+#chatpanel a.close-chatbox-button {
263	265	background-color: #F6F6F6;
264	266	margin-right: 0.6em;
265		- width: 22px;
266	267	}
267	268
268	269	#chatpanel .chat-head #controlbox-tabs li {
...	...	@@ -283,7 +284,7 @@ ul.unstyled-list .glyphicon-chevron-right {
283	284
284	285	#chatpanel #toggle-controlbox {
285	286	font-size: 100% !important;
286		- padding: 0 4px 23px !important;
	287	+ padding: 0 4px 26px !important;
287	288	}
288	289
289	290	#chatpanel {
...	...	@@ -313,9 +314,16 @@ ul.unstyled-list .glyphicon-chevron-right {
313	314	max-width: 189px;
314	315	}
315	316
316		-#chatpanel .chat-content, #chatpanel .chatroom .participants{
317		- border: none;
	317	+#chatpanel .chat-content,
	318	+#chatpanel .chatroom .participants{
	319	+ width: auto;
	320	+}
	321	+
	322	+#chatpanel div#chatrooms {
	323	+ overflow-y: visible;
318	324	}
	325	+
	326	+
319	327	/* End of Converse JS*/
320	328
321	329
...	...
...	...	@@ -6,12 +6,15 @@
6	6
7	7	<link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.css" type="text/css" media="screen, projection" />
8	8
9		- <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
10		- type="text/css" media="screen" charset="utf-8"/>
11	9	<link rel="stylesheet"
12	10	href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css"
13	11	type="text/css" media="screen" charset="utf-8"/>
14	12
	13	+ {% conversejs_static %}
	14	+
	15	+ <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
	16	+ type="text/css" media="screen" charset="utf-8"/>
	17	+
15	18	<script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>
16	19	<script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>
17	20	<script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script>
...	...	@@ -19,8 +22,6 @@
19	22
20	23	<script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script>
21	24
22		- {% conversejs_static %}
23		-
24	25
25	26	{% block head_js %}{% endblock %}
26	27	{% block head_css %}{% endblock %}
...	...	@@ -155,7 +156,9 @@
155	156	{% endblock %}
156	157	</div>
157	158
158		- {% conversejs_chatpanel %}
	159	+ <div class="visible-lg">
	160	+ {% conversejs_chatpanel %}
	161	+ </div>
159	162	{% conversejs_initialize %}
160	163
161	164	{% browserid_js %}
...	...