From bef2cbb462a031d62ba4340a23ac3bf0de866f1f Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 31 Jan 2022 21:51:51 +0100 Subject: [PATCH] Use SVG icons and tweak message padding --- src/modals/muc-details.js | 10 +---- src/modals/templates/muc-details.js | 40 +++++++++++-------- src/modals/templates/user-details.js | 7 +++- src/plugins/muc-views/modals/muc-list.js | 4 +- .../profile/templates/chat-status-modal.js | 10 ++--- src/plugins/rosterview/filterview.js | 3 +- src/plugins/rosterview/styles/roster.scss | 26 ++++++++++-- .../rosterview/templates/roster_filter.js | 10 ++--- .../rosterview/templates/roster_item.js | 16 ++++++-- src/shared/chat/chat-content.js | 3 +- src/shared/chat/message-actions.js | 1 - src/shared/chat/toolbar.js | 6 +-- src/shared/components/styles/icon.scss | 19 ++++++--- src/shared/directives/retraction.js | 2 - src/shared/styles/_core.scss | 14 ++----- src/shared/styles/index.scss | 1 + src/shared/styles/messages.scss | 10 ++--- src/shared/styles/spinner.scss | 19 +++++++++ src/shared/styles/status.scss | 13 ++++-- src/templates/spinner.js | 4 +- src/utils/html.js | 6 +-- 21 files changed, 135 insertions(+), 89 deletions(-) create mode 100644 src/shared/styles/spinner.scss diff --git a/src/modals/muc-details.js b/src/modals/muc-details.js index 3dd718733..95122eeac 100644 --- a/src/modals/muc-details.js +++ b/src/modals/muc-details.js @@ -1,6 +1,5 @@ import BootstrapModal from "plugins/modal/base.js"; import tpl_muc_details from "./templates/muc-details.js"; -import { __ } from 'i18n'; export default BootstrapModal.extend({ @@ -15,13 +14,6 @@ export default BootstrapModal.extend({ }, toHTML () { - return tpl_muc_details(Object.assign( - this.model.toJSON(), { - 'config': this.model.config.toJSON(), - 'display_name': __('Groupchat info for %1$s', this.model.getDisplayName()), - 'features': this.model.features.toJSON(), - 'num_occupants': this.model.occupants.length, - }) - ); + return tpl_muc_details(this.model); } }); diff --git a/src/modals/templates/muc-details.js b/src/modals/templates/muc-details.js index f19bce974..2f00db25b 100644 --- a/src/modals/templates/muc-details.js +++ b/src/modals/templates/muc-details.js @@ -13,7 +13,13 @@ const subject = (o) => { } -export default (o) => { +export default (model) => { + const o = model.toJSON(); + const config = model.config.toJSON(); + const display_name = __('Groupchat info for %1$s', model.getDisplayName()); + const features = model.features.toJSON(); + const num_occupants = model.occupants.filter(o => o.get('show') !== 'offline').length; + const i18n_address = __('Groupchat XMPP address'); const i18n_archiving = __('Message archiving'); const i18n_archiving_help = __('Messages are archived on the server'); @@ -48,7 +54,7 @@ export default (o) => {