diff --git a/src/assets/index.css b/src/assets/index.css index f1f578df..27694566 100644 --- a/src/assets/index.css +++ b/src/assets/index.css @@ -7,13 +7,6 @@ } } @layer utilities { - /* for electron */ - .app-drag { - -webkit-app-region: drag; - } - .app-no-drag { - -webkit-app-region: no-drag; - } /* word break */ .wb { word-break: break-word; diff --git a/src/components/BlankPlaceholder.tsx b/src/components/BlankPlaceholder.tsx index 6916ad04..790592e7 100644 --- a/src/components/BlankPlaceholder.tsx +++ b/src/components/BlankPlaceholder.tsx @@ -46,7 +46,7 @@ const BlankPlaceholder: FC = ({ type = "chat" }) => { const chatHandler = type == "chat" ? toggleChannelModalVisible : toggleUserListVisible; return ( <> -
+

{t("title", { name: server.name })} diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx index e5af7ff0..ef8ab016 100644 --- a/src/components/Modal.tsx +++ b/src/components/Modal.tsx @@ -17,7 +17,6 @@ const Modal: FC> = ({ id = "root-modal", mask = true, c } const wrapper = document.createElement("div"); wrapper.classList.add("wrapper"); - wrapper.classList.add("app-no-drag"); modalRoot.appendChild(wrapper); setWrapper(wrapper); return () => { diff --git a/src/components/StyledSettingContainer.tsx b/src/components/StyledSettingContainer.tsx index 71777013..f3a92a9c 100644 --- a/src/components/StyledSettingContainer.tsx +++ b/src/components/StyledSettingContainer.tsx @@ -36,14 +36,13 @@ const StyledSettingContainer: FC> = ({

{title}

@@ -52,7 +51,7 @@ const StyledSettingContainer: FC> = ({
    {items.map(({ name, link, title }) => { if (link) @@ -92,7 +91,7 @@ const StyledSettingContainer: FC> = ({ ); })} {dangers.length ? ( -
      +
        {dangers.map((d) => { if (typeof d === "boolean" || !d) return null; const { title, handler } = d; @@ -111,7 +110,6 @@ const StyledSettingContainer: FC> = ({
> = ({

)} {/* */} -
{children}
+ {children} {/*
*/}
diff --git a/src/routes/chat/GuestBlankPlaceholder.tsx b/src/routes/chat/GuestBlankPlaceholder.tsx index f88413e6..8fd6e6ad 100644 --- a/src/routes/chat/GuestBlankPlaceholder.tsx +++ b/src/routes/chat/GuestBlankPlaceholder.tsx @@ -25,7 +25,7 @@ const GuestBlankPlaceholder = () => { }; const qrUrl = BASE_ORIGIN; return ( -
+

{t("welcome", { name: serverName })}

diff --git a/src/routes/chat/Layout/index.tsx b/src/routes/chat/Layout/index.tsx index 2801065d..41475c6e 100644 --- a/src/routes/chat/Layout/index.tsx +++ b/src/routes/chat/Layout/index.tsx @@ -94,10 +94,10 @@ const Layout: FC = ({ return ( <> -
-
+
+
{header} -
+
= ({ {aside && (
{aside} diff --git a/src/routes/chat/VoiceFullscreen.tsx b/src/routes/chat/VoiceFullscreen.tsx index dc92f98c..8e33657b 100644 --- a/src/routes/chat/VoiceFullscreen.tsx +++ b/src/routes/chat/VoiceFullscreen.tsx @@ -63,9 +63,9 @@ const VoiceFullscreen = ({ id, context }: Props) => { const membersData = voicingMembers.byId; const hasPin = typeof pinUid !== "undefined"; return ( -
+
{/* top */} -
+
{_name}
{/* middle */} diff --git a/src/routes/chat/index.tsx b/src/routes/chat/index.tsx index b15901ab..19710595 100644 --- a/src/routes/chat/index.tsx +++ b/src/routes/chat/index.tsx @@ -77,7 +77,6 @@ function ChatPage() { {usersModalVisible && }
@@ -100,7 +99,6 @@ function ChatPage() {
= () => { const { pathname } = useLocation(); return ( -
    +
    • diff --git a/src/routes/home/User.tsx b/src/routes/home/User.tsx index ae1cb33d..1d6f3fed 100644 --- a/src/routes/home/User.tsx +++ b/src/routes/home/User.tsx @@ -14,7 +14,7 @@ const User: FC = ({ uid }) => { if (!user) return null; return ( -
      +
      {!guest && (