diff --git a/CHANGELOG.md b/CHANGELOG.md index 81c9a60c..38ee5081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ TODO: tag conversejs livechat branch, and replace commit ID in build-converse.js +TODO: check that the help url is ok for the emojis configuration page. # Changelog diff --git a/assets/styles/configuration.scss b/assets/styles/configuration.scss index db8dadf4..92593965 100644 --- a/assets/styles/configuration.scss +++ b/assets/styles/configuration.scss @@ -33,6 +33,12 @@ $small-view: 800px; font-size: 1.3rem; border-bottom: 2px solid $grey-background-color; padding-bottom: 15px; + } + + livechat-channel-tabs { + display: block; + + /* See Peertube sub-menu-h1 mixin */ margin-bottom: $sub-menu-margin-bottom; } diff --git a/client/@types/global.d.ts b/client/@types/global.d.ts index 9f9eba94..a5fa876e 100644 --- a/client/@types/global.d.ts +++ b/client/@types/global.d.ts @@ -95,6 +95,7 @@ declare const LOC_CHATROOM_NOT_ACCESSIBLE: string declare const LOC_PROMOTE: string declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_EMOJIS_TITLE: string +declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_EMOJIS_DESC: string declare const LOC_LIVECHAT_EMOJIS_SHORTNAME: string declare const LOC_LIVECHAT_EMOJIS_SHORTNAME_DESC: string declare const LOC_LIVECHAT_EMOJIS_FILE: string diff --git a/client/common/configuration/elements/channel-configuration.ts b/client/common/configuration/elements/channel-configuration.ts index 7aa1edac..20b32c9a 100644 --- a/client/common/configuration/elements/channel-configuration.ts +++ b/client/common/configuration/elements/channel-configuration.ts @@ -209,15 +209,20 @@ export class ChannelConfigurationElement extends LivechatElement {
+ ${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_DESC)}
${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_DESC)}
+ +