diff --git a/src/components/common/IconBase.tsx b/src/components/common/IconBase.tsx index 702f3f23..2bbfb8b9 100644 --- a/src/components/common/IconBase.tsx +++ b/src/components/common/IconBase.tsx @@ -21,7 +21,7 @@ interface IconModifiers { export default styled.svg` flex-shrink: 0; - + cursor: pointer; img { width: 100%; height: 100%; diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx index 02510320..86185f19 100644 --- a/src/components/common/messaging/attachments/MessageReply.tsx +++ b/src/components/common/messaging/attachments/MessageReply.tsx @@ -60,6 +60,7 @@ export const ReplyBase = styled.div<{ } .user { + //margin-inline-start: 12px; gap: 6px; display: flex; flex-shrink: 0; @@ -98,6 +99,10 @@ export const ReplyBase = styled.div<{ transition: transform ease-in-out 0.1s; filter: brightness(1); + > svg { + flex-shrink: 0; + } + > span > p { display: flex; align-items: center; diff --git a/src/components/common/user/UserIcon.tsx b/src/components/common/user/UserIcon.tsx index f0f8286e..6ddb74c8 100644 --- a/src/components/common/user/UserIcon.tsx +++ b/src/components/common/user/UserIcon.tsx @@ -1,5 +1,4 @@ -import { MicrophoneOff } from "@styled-icons/boxicons-regular"; -import { VolumeMute } from "@styled-icons/boxicons-solid"; +import { VolumeMute, MicrophoneOff } from "@styled-icons/boxicons-solid"; import { observer } from "mobx-react-lite"; import { useParams } from "react-router-dom"; import { Masquerade } from "revolt-api/types/Channels"; @@ -44,10 +43,6 @@ const VoiceIndicator = styled.div<{ status: VoiceStatus }>` align-items: center; justify-content: center; - svg { - stroke: white; - } - ${(props) => (props.status === "muted" || props.status === "deaf") && css` diff --git a/src/components/markdown/Markdown.module.scss b/src/components/markdown/Markdown.module.scss index a227d762..39cf6d86 100644 --- a/src/components/markdown/Markdown.module.scss +++ b/src/components/markdown/Markdown.module.scss @@ -92,6 +92,7 @@ p > code { padding: 1px 4px; + flex-shrink: 0; } code { diff --git a/src/pages/channels/voice/VoiceHeader.tsx b/src/pages/channels/voice/VoiceHeader.tsx index fa9ded8f..7702161c 100644 --- a/src/pages/channels/voice/VoiceHeader.tsx +++ b/src/pages/channels/voice/VoiceHeader.tsx @@ -1,10 +1,8 @@ -import { BarChart } from "@styled-icons/boxicons-regular"; import { - Megaphone, + BarChartAlt2, Microphone, MicrophoneOff, PhoneOff, - Speaker, VolumeFull, VolumeMute, } from "@styled-icons/boxicons-solid"; @@ -41,16 +39,16 @@ const VoiceBase = styled.div` align-items: center; padding: 10px; - font-size: 14px; - font-weight: 600; + font-size: 13px; + font-weight: 500; user-select: none; + gap: 6px; color: var(--success); border-radius: var(--border-radius); background: var(--primary-background); svg { - margin-inline-end: 4px; cursor: help; } } @@ -59,7 +57,7 @@ const VoiceBase = styled.div` flex-direction: column; .participants { - margin: 20px 0; + margin: 40px 20px; justify-content: center; user-select: none; display: flex; @@ -137,42 +135,42 @@ export default observer(({ id }: Props) => { )}
- + {voiceState.status === VoiceStatus.CONNECTED && ( )}
- + {voiceState.isProducing("audio") ? ( - + ) : ( - + )} {voiceState.isDeaf() ? ( - + ) : ( - + )} diff --git a/src/pages/settings/panes/Profile.tsx b/src/pages/settings/panes/Profile.tsx index 8112277b..02f5dfe8 100644 --- a/src/pages/settings/panes/Profile.tsx +++ b/src/pages/settings/panes/Profile.tsx @@ -96,8 +96,8 @@ export const Profile = observer(() => {