Download as
Browse Code »

Commit c1b92d9acff9c69aab2f43502ffd7cadac5491e4

Authored by Sergio Oliveira
1 parent 440eb406
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixing chat styles

Showing 3 changed files with 27 additions and 11 deletions   Show diff stats
@@ -6,6 +6,11 @@ Planet @@ -6,6 +6,11 @@ Planet
6 6
7 * Paginator esta quebrado em telas xs 7 * Paginator esta quebrado em telas xs
8 8
  9 +Chat
  10 +====
  11 +
  12 +* Allow user to change passwords
  13 +
9 14
10 Outros 15 Outros
11 ======= 16 =======
src/static/css/screen.css
  Diff comments   View file @c1b92d9
@@ -251,7 +251,8 @@ ul.unstyled-list .glyphicon-chevron-right { @@ -251,7 +251,8 @@ ul.unstyled-list .glyphicon-chevron-right {
251 padding: 0; 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 margin: 2px 10px; 256 margin: 2px 10px;
256 } 257 }
257 258
@@ -259,10 +260,10 @@ ul.unstyled-list .glyphicon-chevron-right { @@ -259,10 +260,10 @@ ul.unstyled-list .glyphicon-chevron-right {
259 margin-top: 10px; 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 background-color: #F6F6F6; 265 background-color: #F6F6F6;
264 margin-right: 0.6em; 266 margin-right: 0.6em;
265 - width: 22px;  
266 } 267 }
267 268
268 #chatpanel .chat-head #controlbox-tabs li { 269 #chatpanel .chat-head #controlbox-tabs li {
@@ -283,7 +284,7 @@ ul.unstyled-list .glyphicon-chevron-right { @@ -283,7 +284,7 @@ ul.unstyled-list .glyphicon-chevron-right {
283 284
284 #chatpanel #toggle-controlbox { 285 #chatpanel #toggle-controlbox {
285 font-size: 100% !important; 286 font-size: 100% !important;
286 - padding: 0 4px 23px !important; 287 + padding: 0 4px 26px !important;
287 } 288 }
288 289
289 #chatpanel { 290 #chatpanel {
@@ -313,9 +314,16 @@ ul.unstyled-list .glyphicon-chevron-right { @@ -313,9 +314,16 @@ ul.unstyled-list .glyphicon-chevron-right {
313 max-width: 189px; 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 /* End of Converse JS*/ 327 /* End of Converse JS*/
320 328
321 329
src/templates/base.html
  Diff comments   View file @c1b92d9
@@ -6,12 +6,15 @@ @@ -6,12 +6,15 @@
6 6
7 <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.css" type="text/css" media="screen, projection" /> 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 <link rel="stylesheet" 9 <link rel="stylesheet"
12 href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css" 10 href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css"
13 type="text/css" media="screen" charset="utf-8"/> 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 <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script> 18 <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>
16 <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script> 19 <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>
17 <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script> 20 <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script>
@@ -19,8 +22,6 @@ @@ -19,8 +22,6 @@
19 22
20 <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script> 23 <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script>
21 24
22 - {% conversejs_static %}  
23 -  
24 25
25 {% block head_js %}{% endblock %} 26 {% block head_js %}{% endblock %}
26 {% block head_css %}{% endblock %} 27 {% block head_css %}{% endblock %}
@@ -155,7 +156,9 @@ @@ -155,7 +156,9 @@
155 {% endblock %} 156 {% endblock %}
156 </div> 157 </div>
157 158
158 - {% conversejs_chatpanel %} 159 + <div class="visible-lg">
  160 + {% conversejs_chatpanel %}
  161 + </div>
159 {% conversejs_initialize %} 162 {% conversejs_initialize %}
160 163
161 {% browserid_js %} 164 {% browserid_js %}