diff --git a/dist/index.css b/dist/index.css index e509d0bd..0d5a180e 100644 --- a/dist/index.css +++ b/dist/index.css @@ -205,31 +205,34 @@ body[showing-chat] #chat-page-wrapper { #chat-page { --ribbon-size: calc(var(--control-height) + 2 * var(--gap-between-tiles)); } -#chat-page #ribbon, -#chat-page .toolbar, -#chat-page #main, -#chat-page #main .content { +#chat-page > div, +#chat-page > div > #ribbon, +#chat-page > div > #main, +#chat-page > div > #main > div, +#chat-page > div > #main > div > .pane, +#chat-page > div > #main > div > .pane > .toolbar, +#chat-page > div > #main > div > .pane > .content { display: flex; } #chat-page > div { padding: 0px; overflow: hidden; - display: flex; } -#chat-page #main { +#chat-page > div > #main { width: calc(100% - var(--ribbon-size)); - display: flex; - flex-direction: column; } #chat-page #main > div, -#chat-page #main .content { +#chat-page > div > #main > div > .pane, +#chat-page > div > #main > div > .pane > .content { width: 100%; height: 100%; flex: 1; - display: flex; +} +#chat-page > div > #main > div > .pane { flex-direction: column; } -#chat-page #main .content { +#chat-page > div > #main > div > .pane > .content { + flex-direction: column; overflow: auto; padding: var(--content-padding); } @@ -238,41 +241,41 @@ body[showing-chat] #chat-page-wrapper { #chat-page #main .content { flex-direction: column; } -#chat-page #ribbon { +#chat-page > div > #ribbon { width: var(--ribbon-size); border-right: 1px solid var(--border); justify-content: space-between; padding-bottom: var(--safe-area-bottom); } -#chat-page #ribbon > span { +#chat-page > div > #ribbon > span { height: 100%; flex: 1; overflow: auto; justify-content: flex-end; } -#chat-page #main .toolbar { +#chat-page > div > #main > div > .pane > .toolbar { height: var(--ribbon-size); border-bottom: 1px solid var(--border); overflow-x: auto; padding-left: var(--content-padding); border-top: 1px solid var(--border); } -#chat-page #ribbon, -#chat-page .toolbar { +#chat-page > div > #ribbon, +#chat-page > div > #main > div > .pane > .toolbar { align-items: center; } #chat-page #ribbon > span, -#chat-page .toolbar > span { +#chat-page > div > #main > div > .pane > .toolbar > span { display: flex; flex-direction: column; padding: var(--gap-between-tiles); gap: var(--gap-between-tiles); } -#chat-page #ribbon > span { +#chat-page > div > #ribbon > span { width: 100%; } -#chat-page #ribbon button, -#chat-page .toolbar button { +#chat-page > div > #ribbon button, +#chat-page > div > #main > div > .pane > .toolbar button { padding: 0px; width: 100%; max-width: var(--control-height); @@ -281,7 +284,7 @@ body[showing-chat] #chat-page-wrapper { align-items: center; justify-content: center; } -#chat-page #ribbon > button { +#chat-page > div > #ribbon > button { margin-top: var(--gap-between-tiles); } diff --git a/dist/index.js b/dist/index.js index 9dba47b9..17e4fa2c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1604,7 +1604,7 @@ } chatViewModel.chatMessageViewModels.subscribeSilent(scrollDownIfApplicable); setTimeout(() => scrollDown(), 100); - return /* @__PURE__ */ createElement("div", { id: "message-page" }, /* @__PURE__ */ createElement("div", { class: "toolbar" }, /* @__PURE__ */ createElement("span", { "subscribe:innerText": chatViewModel.primaryChannel })), /* @__PURE__ */ createElement("div", { class: "content" }, messageContainer, /* @__PURE__ */ createElement("div", { id: "composer" }, /* @__PURE__ */ createElement("div", { class: "content-width-constraint" }, /* @__PURE__ */ createElement("div", { class: "input-width-constraint" }, /* @__PURE__ */ createElement( + return /* @__PURE__ */ createElement("div", { id: "message-page" }, /* @__PURE__ */ createElement("div", { class: "pane" }, /* @__PURE__ */ createElement("div", { class: "toolbar" }, /* @__PURE__ */ createElement("span", { "subscribe:innerText": chatViewModel.primaryChannel })), /* @__PURE__ */ createElement("div", { class: "content" }, messageContainer, /* @__PURE__ */ createElement("div", { id: "composer" }, /* @__PURE__ */ createElement("div", { class: "content-width-constraint" }, /* @__PURE__ */ createElement("div", { class: "input-width-constraint" }, /* @__PURE__ */ createElement( "input", { "bind:value": chatViewModel.composingMessage, @@ -1620,7 +1620,7 @@ "toggle:disabled": chatViewModel.cannotSendMessage }, /* @__PURE__ */ createElement("span", { class: "icon" }, "send") - )))))); + ))))))); } // src/View/Components/dangerousActionButton.tsx @@ -1677,7 +1677,7 @@ chatViewModel.removeSecondaryChannel(secondaryChannel); }); }; - return /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("div", { class: "toolbar" }, /* @__PURE__ */ createElement("span", null, translations.chatPage.settings.settingsHeadline)), /* @__PURE__ */ createElement("div", { class: "content" }, /* @__PURE__ */ createElement("label", { class: "tile flex-no" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "forum"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translations.chatPage.settings.primaryChannelLabel), /* @__PURE__ */ createElement( + return /* @__PURE__ */ createElement("div", { id: "settings-page" }, /* @__PURE__ */ createElement("div", { class: "pane" }, /* @__PURE__ */ createElement("div", { class: "toolbar" }, /* @__PURE__ */ createElement("span", null, translations.chatPage.settings.settingsHeadline)), /* @__PURE__ */ createElement("div", { class: "content" }, /* @__PURE__ */ createElement("label", { class: "tile flex-no" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "forum"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translations.chatPage.settings.primaryChannelLabel), /* @__PURE__ */ createElement( "input", { "bind:value": chatViewModel.primaryChannelInput, @@ -1764,7 +1764,7 @@ translations.chatPage.settings.deleteChatButton, "chat_error", chatViewModel.remove - )))); + ))))); } // src/View/ChatPages/taskPage.tsx diff --git a/src/View/ChatPages/messagePage.tsx b/src/View/ChatPages/messagePage.tsx index 2b70442e..cf734de2 100644 --- a/src/View/ChatPages/messagePage.tsx +++ b/src/View/ChatPages/messagePage.tsx @@ -33,31 +33,33 @@ export function MessagePage(chatViewModel: ChatViewModel) { return (