github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: chat navbar follow-ups (#24951)

Browse Source 
- correctly accounts for navbar height on ipad and when keyboard is open
- fixes an incorrect I18n key
This commit is contained in:
Joffrey JAFFEUX
2023-12-18 20:22:13 +01:00
committed by GitHub
parent 53b96638c5
commit 2ed59266a9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info.gjs
View File

@ -15,7 +15,7 @@ export default class ChatRoutesChannelInfo extends Component {
membersLabel = I18n.t("chat.channel_info.tabs.members"); membersLabel = I18n.t("chat.channel_info.tabs.members");
settingsLabel = I18n.t("chat.channel_info.tabs.settings"); 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"); backToAllChannelsLabel = I18n.t("chat.channel_info.back_to_channel");
get showTabs() { get showTabs() {

9
plugins/chat/assets/stylesheets/common/chat-height-mixin.scss
View File

@ -3,19 +3,22 @@
// 46px is the height of the navbar // 46px is the height of the navbar
height: calc( height: calc(
var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) - 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 // mobile with keyboard opened
.keyboard-visible & { .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 // ipad
.footer-nav-ipad & { .footer-nav-ipad & {
height: calc( height: calc(
var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) - var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) -
var(--composer-height, 0px) var(--chat-header-offset, 0px) - var(--composer-height, 0px)
); );
} }
} }