From 2ed59266a962a3968d19c7877cc8f1df5ef34a6f Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 18 Dec 2023 20:22:13 +0100 Subject: [PATCH] FIX: chat navbar follow-ups (#24951) - correctly accounts for navbar height on ipad and when keyboard is open - fixes an incorrect I18n key --- .../discourse/components/chat/routes/channel-info.gjs | 2 +- .../assets/stylesheets/common/chat-height-mixin.scss | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info.gjs index d853ae66b50..200b6a7ea4b 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info.gjs @@ -15,7 +15,7 @@ export default class ChatRoutesChannelInfo extends Component { membersLabel = I18n.t("chat.channel_info.tabs.members"); settingsLabel = I18n.t("chat.channel_info.tabs.settings"); - backToChannelLabel = I18n.t("chat.channel_info.back_to_all_channel"); + backToChannelLabel = I18n.t("chat.channel_info.back_to_all_channels"); backToAllChannelsLabel = I18n.t("chat.channel_info.back_to_channel"); get showTabs() { diff --git a/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss b/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss index c7b5d91d807..18d10a01e80 100644 --- a/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss +++ b/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss @@ -3,19 +3,22 @@ // 46px is the height of the navbar height: calc( var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) - - var(--composer-height, 0px) - var(--chat-header-offset) + var(--composer-height, 0px) - var(--chat-header-offset, 0px) ); // mobile with keyboard opened .keyboard-visible & { - height: calc(var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px)); + height: calc( + var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) - + var(--chat-header-offset, 0px) + ); } // ipad .footer-nav-ipad & { height: calc( var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) - - var(--composer-height, 0px) + var(--chat-header-offset, 0px) - var(--composer-height, 0px) ); } }