From c97033a2d5bcee069d237d292f55be2207b3a0eb Mon Sep 17 00:00:00 2001 From: Zambom Date: Tue, 17 Oct 2017 14:02:15 -0300 Subject: [PATCH] Adjusting participants modal responsivity --- amadeus/static/css/base/amadeus_responsive.css | 4 ++++ amadeus/static/js/chat.js | 4 ++-- chat/templates/chat/_profile.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/amadeus/static/css/base/amadeus_responsive.css b/amadeus/static/css/base/amadeus_responsive.css index 2cc5282..3a59e28 100755 --- a/amadeus/static/css/base/amadeus_responsive.css +++ b/amadeus/static/css/base/amadeus_responsive.css @@ -700,6 +700,10 @@ height: 100%; } + #chat-modal-info .modal-content.user_info { + overflow-y: scroll; + } + .talk_header { height: 9%; } diff --git a/amadeus/static/js/chat.js b/amadeus/static/js/chat.js index da0fb6d..2508f1e 100644 --- a/amadeus/static/js/chat.js +++ b/amadeus/static/js/chat.js @@ -116,7 +116,7 @@ function getModalInfo(btn, space, space_type) { $('.chat_badge').each(function () { var actual = $(this).text(); - if (actual != "+99") { + if (actual != "+99" && !isNaN(viewed)) { actual = parseInt(actual, 10) - viewed; if (actual <= 0) { @@ -141,7 +141,7 @@ function getModalInfo(btn, space, space_type) { var subject_cbadge = $("#subject_" + sub_badge).find('.chat_notify'), actual = subject_cbadge.text(); - if (actual != "+99") { + if (actual != "+99" && !isNaN(viewed)) { actual = parseInt(actual, 10) - viewed; if (actual <= 0) { diff --git a/chat/templates/chat/_profile.html b/chat/templates/chat/_profile.html index 546cfe0..bdb15df 100644 --- a/chat/templates/chat/_profile.html +++ b/chat/templates/chat/_profile.html @@ -3,7 +3,7 @@ {% is_online participant as status %}