Download as
Browse Code »

Commit c97033a2d5bcee069d237d292f55be2207b3a0eb

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

Adjusting participants modal responsivity

Showing 3 changed files with 7 additions and 3 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @c97033a
@@ -700,6 +700,10 @@ @@ -700,6 +700,10 @@
700 height: 100%; 700 height: 100%;
701 } 701 }
702 702
  703 + #chat-modal-info .modal-content.user_info {
  704 + overflow-y: scroll;
  705 + }
  706 +
703 .talk_header { 707 .talk_header {
704 height: 9%; 708 height: 9%;
705 } 709 }
amadeus/static/js/chat.js
  Diff comments   View file @c97033a
@@ -116,7 +116,7 @@ function getModalInfo(btn, space, space_type) { @@ -116,7 +116,7 @@ function getModalInfo(btn, space, space_type) {
116 $('.chat_badge').each(function () { 116 $('.chat_badge').each(function () {
117 var actual = $(this).text(); 117 var actual = $(this).text();
118 118
119 - if (actual != "+99") { 119 + if (actual != "+99" && !isNaN(viewed)) {
120 actual = parseInt(actual, 10) - viewed; 120 actual = parseInt(actual, 10) - viewed;
121 121
122 if (actual <= 0) { 122 if (actual <= 0) {
@@ -141,7 +141,7 @@ function getModalInfo(btn, space, space_type) { @@ -141,7 +141,7 @@ function getModalInfo(btn, space, space_type) {
141 var subject_cbadge = $("#subject_" + sub_badge).find('.chat_notify'), 141 var subject_cbadge = $("#subject_" + sub_badge).find('.chat_notify'),
142 actual = subject_cbadge.text(); 142 actual = subject_cbadge.text();
143 143
144 - if (actual != "+99") { 144 + if (actual != "+99" && !isNaN(viewed)) {
145 actual = parseInt(actual, 10) - viewed; 145 actual = parseInt(actual, 10) - viewed;
146 146
147 if (actual <= 0) { 147 if (actual <= 0) {
chat/templates/chat/_profile.html
  Diff comments   View file @c97033a
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 {% is_online participant as status %} 3 {% is_online participant as status %}
4 4
5 <div class="modal-dialog" role="document"> 5 <div class="modal-dialog" role="document">
6 - <div class="modal-content"> 6 + <div class="modal-content user_info">
7 <div class="modal-header"> 7 <div class="modal-header">
8 <button type="button" class="close" data-dismiss="modal" aria-label="{% trans 'Close' %}"><span aria-hidden="true">&times;</span></button> 8 <button type="button" class="close" data-dismiss="modal" aria-label="{% trans 'Close' %}"><span aria-hidden="true">&times;</span></button>
9 </div> 9 </div>