From ba689f41858f402c7b6068c08e3f22e559279340 Mon Sep 17 00:00:00 2001 From: Lauren Mayers Date: Sun, 7 Oct 2018 14:17:52 -0400 Subject: [PATCH] Update user status colors and icons fixes #1209 --- CHANGES.md | 1 + css/converse.css | 22 +++++++++++----------- dist/converse.js | 20 ++++++++++---------- mockup/user-panel.html | 4 ++-- sass/_controlbox.scss | 6 +++--- sass/_lists.scss | 4 ++-- src/templates/chat_status_modal.html | 8 ++++---- src/templates/profile_view.html | 10 +++++----- 8 files changed, 38 insertions(+), 37 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a1ea99537..db3e04b6d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,7 @@ - #1193 OMEMO messages without a `` fallback are ignored - #1199 Can't get back from to login screen from registration screen - #1204 Link encoding issue +- #1209 Bring color codes of users' status in line with other clients - #1214 Setting `allow_contact_requests` to `false` has no effect - #1221 Avoid creating a headlines box if we don't have anything to show inside it - #1222 Adding a bookmark should prefill the room name diff --git a/css/converse.css b/css/converse.css index 37a08c78b..e5e75d243 100644 --- a/css/converse.css +++ b/css/converse.css @@ -9706,17 +9706,17 @@ body.reset { color: #578EA9; font-size: 20px; margin-right: 0.5em; } -#conversejs .set-xmpp-status .fa-circle, -#conversejs .xmpp-status .fa-circle, -#conversejs .roster-contacts .fa-circle { +#conversejs .set-xmpp-status .chat-status--online, +#conversejs .xmpp-status .chat-status--online, +#conversejs .roster-contacts .chat-status--online { color: #3AA569; } -#conversejs .set-xmpp-status .fa-minus-circle, -#conversejs .xmpp-status .fa-minus-circle, -#conversejs .roster-contacts .fa-minus-circle { +#conversejs .set-xmpp-status .chat-status--busy, +#conversejs .xmpp-status .chat-status--busy, +#conversejs .roster-contacts .chat-status--busy { color: #E77051; } -#conversejs .set-xmpp-status .fa-dot-circle-o, -#conversejs .xmpp-status .fa-dot-circle-o, -#conversejs .roster-contacts .fa-dot-circle-o { +#conversejs .set-xmpp-status .chat-status--away, +#conversejs .xmpp-status .chat-status--away, +#conversejs .roster-contacts .chat-status--away { color: #E7A151; } #conversejs .set-xmpp-status .far.fa-circle, #conversejs .set-xmpp-status .fa-times-circle, @@ -10339,8 +10339,8 @@ body.reset { color: #89d6ab; } #conversejs .items-list .list-item.open .fa-minus-circle { color: #f0a794; } - #conversejs .items-list .list-item.open .fa-dot-circle-o { - color: #f0c594; } + #conversejs .items-list .list-item.open .fa-dot-circle { + color: #f6dec1; } #conversejs .items-list .list-item.open .far .fa-circle, #conversejs .items-list .list-item.open .fa-times-circle { color: #e6e7e4; } diff --git a/dist/converse.js b/dist/converse.js index ef8953393..8f69b48ea 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -43834,6 +43834,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ return; } if (_.isBoolean(plugin.enabled) && plugin.enabled || _.isFunction(plugin.enabled) && plugin.enabled(this.plugged) || _.isNil(plugin.enabled)) { + _.extend(plugin, this.properties); if (plugin.dependencies) { this.loadPluginDependencies(plugin); @@ -43907,7 +43908,6 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ //# sourceMappingURL=pluggable.js.map - /***/ }), /***/ "./node_modules/process/browser.js": @@ -78403,25 +78403,25 @@ __e(o.label_close) + if (o.status === 'online') { ; __p += ' checked="checked" '; } ; -__p += '\n type="radio" id="radio-online" value="online" name="chat_status" class="custom-control-input">\n