From cce2cfa61406df3f609b66b3b4ac97b538deebfc Mon Sep 17 00:00:00 2001 From: Shea Date: Thu, 11 Jun 2026 18:58:09 +0300 Subject: [PATCH 1/2] styling changes Signed-off-by: Shea --- src/app/components/message/PollEvent.tsx | 4 ++-- src/app/features/room/RoomInput.tsx | 4 ++-- .../room/poll-modals/PollDialog.css.tsx | 2 +- .../features/room/poll-modals/PollDialog.tsx | 21 +++++++++++++++---- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/app/components/message/PollEvent.tsx b/src/app/components/message/PollEvent.tsx index dae699a38..7f7cfa657 100644 --- a/src/app/components/message/PollEvent.tsx +++ b/src/app/components/message/PollEvent.tsx @@ -191,7 +191,7 @@ export function PollEvent({ content, mEvent, mx, room }: PollEventProps) { const maxValue = Math.max(...Object.values(votes)); let endText = 'The Poll has ended and'; const winnerArray = answers.filter((item) => votes[item.id] === maxValue); - if (votes.maxValue === 0) endText += ' nobody voted'; + if (maxValue === 0) endText += ' nobody voted'; else if (winnerArray.length === 1 && winnerArray[0]) endText += `${winnerArray[0][M_TEXT.name]} won`; else { @@ -223,7 +223,7 @@ export function PollEvent({ content, mEvent, mx, room }: PollEventProps) { // The choice of making it not the same size and style as an Attachment is deliberate as Polls tipically are Way more wordy and this feels more spacious return ( <> - + {questionBody} diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx index 02644cf7e..6f52acf38 100644 --- a/src/app/features/room/RoomInput.tsx +++ b/src/app/features/room/RoomInput.tsx @@ -1586,8 +1586,8 @@ export const RoomInput = forwardRef( variant="SurfaceVariant" size="300" radii="300" - title="Upload File" - aria-label="Upload and attach a File" + title={editorOldAddFile ? 'Upload File' : 'Add'} + aria-label={editorOldAddFile ? 'Upload and attach a File' : 'Add new Item'} > diff --git a/src/app/features/room/poll-modals/PollDialog.css.tsx b/src/app/features/room/poll-modals/PollDialog.css.tsx index 3bbf5dbbd..648180242 100644 --- a/src/app/features/room/poll-modals/PollDialog.css.tsx +++ b/src/app/features/room/poll-modals/PollDialog.css.tsx @@ -16,8 +16,8 @@ export const PollDialogTitle = style({ }); export const PollDialogAnswerBody = style({ maxHeight: toRem(300), - overflow: 'scroll', }); +export const PollDialogAnswerContainer = style({ paddingTop: toRem(4) }); export const PollDialogAnswerInput = style({ width: '100%' }); export const PollDialogMaxSelectionNumber = style({ width: toRem(80) }); diff --git a/src/app/features/room/poll-modals/PollDialog.tsx b/src/app/features/room/poll-modals/PollDialog.tsx index d9c8036ca..60418d78c 100644 --- a/src/app/features/room/poll-modals/PollDialog.tsx +++ b/src/app/features/room/poll-modals/PollDialog.tsx @@ -15,6 +15,7 @@ import { Chip, Switch, color, + Scroll, } from 'folds'; import { stopPropagation } from '$utils/keyboard'; import type { ChangeEventHandler, KeyboardEventHandler } from 'react'; @@ -204,9 +205,21 @@ export function PollDialog({ onCancel, mx, room, replyDraft, clearReplyDraft }: Add Option - + {answers.map((item, index) => ( - + ))} - + - + Date: Thu, 11 Jun 2026 19:22:33 +0300 Subject: [PATCH 2/2] change it to fill soft Signed-off-by: Shea --- src/app/components/message/PollEvent.tsx | 8 +++++++- src/app/features/room/poll-modals/PollDialog.tsx | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/components/message/PollEvent.tsx b/src/app/components/message/PollEvent.tsx index 7f7cfa657..c6984f55d 100644 --- a/src/app/components/message/PollEvent.tsx +++ b/src/app/components/message/PollEvent.tsx @@ -298,7 +298,13 @@ export function PollEvent({ content, mEvent, mx, room }: PollEventProps) { : ''} {!isEnded && canEnd && ( - )} diff --git a/src/app/features/room/poll-modals/PollDialog.tsx b/src/app/features/room/poll-modals/PollDialog.tsx index 60418d78c..7e6aeb5d4 100644 --- a/src/app/features/room/poll-modals/PollDialog.tsx +++ b/src/app/features/room/poll-modals/PollDialog.tsx @@ -313,6 +313,7 @@ export function PollDialog({ onCancel, mx, room, replyDraft, clearReplyDraft }: type="submit" variant="Primary" onClick={handleSubmit} + fill="Soft" title="Create Poll" aria-label="Create Poll" >