Download as
Browse Code »

Commit 3f18035b7c64c504f83a6614743516076ef56cd3

Authored by Zambom
1 parent d2b8b1a2
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adjusting chat participants list responsivity

Showing 5 changed files with 8 additions and 7 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @3f18035
@@ -1297,6 +1297,7 @@ div.dataTables_wrapper div.dataTables_paginate { @@ -1297,6 +1297,7 @@ div.dataTables_wrapper div.dataTables_paginate {
1297 /* Chat */ 1297 /* Chat */
1298 .participants-group, .talks-group { 1298 .participants-group, .talks-group {
1299 margin-left: 40px; 1299 margin-left: 40px;
  1300 + margin-right: 5px;
1300 } 1301 }
1301 1302
1302 .participant { 1303 .participant {
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @3f18035
@@ -210,7 +210,7 @@ @@ -210,7 +210,7 @@
210 padding: 0px; 210 padding: 0px;
211 } 211 }
212 212
213 - .talks-group { 213 + .talks-group, .participants-group {
214 margin-left: 0px; 214 margin-left: 0px;
215 margin-right: 0px; 215 margin-right: 0px;
216 } 216 }
chat/templates/chat/_view_participant.html
  Diff comments   View file @3f18035
@@ -2,14 +2,14 @@ @@ -2,14 +2,14 @@
2 2
3 {% is_online participant as status %} 3 {% is_online participant as status %}
4 4
5 -<div class="col-md-12 col-sm-12 participant panel">  
6 - <div class="col-md-1 col-sm-1 user-img"> 5 +<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 participant panel">
  6 + <div class="col-md-1 col-sm-1 col-xs-2 user-img">
7 <img src="{{ participant.image_url }}" class="img-responsive" /> 7 <img src="{{ participant.image_url }}" class="img-responsive" />
8 </div> 8 </div>
9 - <div class="col-md-4 col-sm-4 user-info"> 9 + <div class="col-md-4 col-sm-4 col-xs-10 user-info">
10 <h4><a class="user_{{ participant.id }}_status status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4> 10 <h4><a class="user_{{ participant.id }}_status status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4>
11 </div> 11 </div>
12 - <div class="col-md-6 col-sm-6 buttons pull-right text-center"> 12 + <div class="col-md-6 col-sm-6 col-xs-12 buttons pull-right text-center">
13 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:profile" participant.email %}' class="btn btn-raised btn-default">{% trans 'See Profile' %}</a> 13 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:profile" participant.email %}' class="btn btn-raised btn-default">{% trans 'See Profile' %}</a>
14 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-raised btn-success">{% trans 'Send Message' %}</a> 14 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-raised btn-success">{% trans 'Send Message' %}</a>
15 </div> 15 </div>
chat/templates/chat/list.html
  Diff comments   View file @3f18035
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <div class="panel category-panel-content panel-body"> 41 <div class="panel category-panel-content panel-body">
42 <h2 class="my-subjects-title"><b>{% trans 'Conversations' %}</b></h2> 42 <h2 class="my-subjects-title"><b>{% trans 'Conversations' %}</b></h2>
43 43
44 - <div class="talks-group"> 44 + <div class="talks-group row">
45 {% for chat in conversations %} 45 {% for chat in conversations %}
46 {% include 'chat/_view.html' with space="0" space_type='general' %} 46 {% include 'chat/_view.html' with space="0" space_type='general' %}
47 {% endfor %} 47 {% endfor %}
chat/templates/chat/list_participants.html
  Diff comments   View file @3f18035
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <div class="panel category-panel-content panel-body"> 43 <div class="panel category-panel-content panel-body">
44 <h2 class="my-subjects-title"><b>{% trans 'Participants' %}</b></h2> 44 <h2 class="my-subjects-title"><b>{% trans 'Participants' %}</b></h2>
45 45
46 - <div class="participants-group"> 46 + <div class="participants-group row">
47 {% for participant in participants %} 47 {% for participant in participants %}
48 {% include 'chat/_view_participant.html' with space="0" space_type='general' %} 48 {% include 'chat/_view_participant.html' with space="0" space_type='general' %}
49 {% endfor %} 49 {% endfor %}