From 23e2aceacae3129cacc389f32cd8215c1854c10b Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 14 Dec 2017 13:45:14 +0000 Subject: [PATCH] Indicate visitors by making them lighter grey --- css/converse.css | 3 +++ css/inverse.css | 3 +++ sass/_chatrooms.scss | 3 +++ sass/converse/_variables.scss | 1 + sass/inverse/_variables.scss | 1 + src/converse-muc.js | 2 +- 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/css/converse.css b/css/converse.css index 588cf4dab..f0a6b2fb9 100644 --- a/css/converse.css +++ b/css/converse.css @@ -2658,6 +2658,9 @@ #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.moderator, #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.moderator { color: #D24E2B; } + #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.visitor, + #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.visitor { + color: #A8ABA1; } #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chatroom-form-container, #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container { background-color: white; diff --git a/css/inverse.css b/css/inverse.css index 73318a21d..84ebec0f0 100644 --- a/css/inverse.css +++ b/css/inverse.css @@ -2820,6 +2820,9 @@ body { #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.moderator, #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.moderator { color: #E77051; } + #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.visitor, + #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.visitor { + color: #A8ABA1; } #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chatroom-form-container, #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container { background-color: white; diff --git a/sass/_chatrooms.scss b/sass/_chatrooms.scss index 2546278d6..5252e1c50 100644 --- a/sass/_chatrooms.scss +++ b/sass/_chatrooms.scss @@ -182,6 +182,9 @@ &.moderator { color: $moderator-color; } + &.visitor { + color: $visitor-color; + } } } } diff --git a/sass/converse/_variables.scss b/sass/converse/_variables.scss index 20657235b..e4bf3773c 100644 --- a/sass/converse/_variables.scss +++ b/sass/converse/_variables.scss @@ -7,6 +7,7 @@ $subdued-color: #A8ABA1 !default; $gray-color: #818479 !default; $dark-gray-color: #585B51!default; +$visitor-color: #A8ABA1 !default; $lightest-blue: #89B7CD; $light-blue: #578EA9; diff --git a/sass/inverse/_variables.scss b/sass/inverse/_variables.scss index d2a46b8c2..cea504ae2 100644 --- a/sass/inverse/_variables.scss +++ b/sass/inverse/_variables.scss @@ -7,6 +7,7 @@ $subdued-color: #A8ABA1 !default; $gray-color: #818479 !default; $dark-gray-color: #585B51!default; +$visitor-color: #A8ABA1 !default; $lightest-blue: #89B7CD; $light-blue: #578EA9; diff --git a/src/converse-muc.js b/src/converse-muc.js index 908d20abf..8b5b03f5b 100755 --- a/src/converse-muc.js +++ b/src/converse-muc.js @@ -1801,7 +1801,7 @@ if (notification.reason) { this.showStatusNotification(__('The reason given is: "%1$s".', notification.reason), true); } - if (notification.messages.length) { + if (_.get(notification.messages, 'length')) { this.scrollDown(); } },