diff --git a/external/lang b/external/lang index 1bf1a75b..33af4890 160000 --- a/external/lang +++ b/external/lang @@ -1 +1 @@ -Subproject commit 1bf1a75b4dcc3b8543651c792ee0901b9db57e39 +Subproject commit 33af4890e56757c27a5bbd23e81d05f03c4a0cde diff --git a/src/components/common/ServerHeader.tsx b/src/components/common/ServerHeader.tsx index 9b09fae5..5eb3fc71 100644 --- a/src/components/common/ServerHeader.tsx +++ b/src/components/common/ServerHeader.tsx @@ -26,9 +26,6 @@ const ServerBanner = styled.div` display: flex; flex-direction: column; justify-content: end; - /*background-position: center; - background-repeat: no-repeat; - background-size: cover;*/ background-size: cover !important; background-position: center center !important; diff --git a/src/components/common/messaging/bars/NewMessages.tsx b/src/components/common/messaging/bars/NewMessages.tsx index 0ea6dfa7..21829849 100644 --- a/src/components/common/messaging/bars/NewMessages.tsx +++ b/src/components/common/messaging/bars/NewMessages.tsx @@ -49,7 +49,7 @@ export default observer( } }}>
- New messages since{" "} + {" "} {dayjs(decodeTime(last_id)).fromNow()}
diff --git a/src/components/common/messaging/embed/EmbedInvite.tsx b/src/components/common/messaging/embed/EmbedInvite.tsx index 165a6f7b..1873f14f 100644 --- a/src/components/common/messaging/embed/EmbedInvite.tsx +++ b/src/components/common/messaging/embed/EmbedInvite.tsx @@ -1,3 +1,4 @@ +import { Group } from "@styled-icons/boxicons-solid"; import { autorun } from "mobx"; import { observer } from "mobx-react-lite"; import { useHistory } from "react-router-dom"; @@ -47,7 +48,7 @@ const EmbedInviteBase = styled.div` const EmbedInviteDetails = styled.div` flex-grow: 1; - padding-left: 12px; + padding-inline-start: 12px; ${() => isTouchscreenDevice && css` @@ -63,7 +64,14 @@ const EmbedInviteName = styled.div` `; const EmbedInviteMemberCount = styled.div` + display: flex; + align-items: center; + gap: 2px; font-size: 0.8em; + + > svg { + color: var(--secondary-foreground); + } `; type Props = { @@ -119,6 +127,7 @@ export function EmbedInvite({ code }: Props) { {invite.server_name} + {invite.member_count.toLocaleString()}{" "} {invite.member_count === 1 ? "member" : "members"} diff --git a/src/components/navigation/SidebarBase.tsx b/src/components/navigation/SidebarBase.tsx index 218e3b91..214b848e 100644 --- a/src/components/navigation/SidebarBase.tsx +++ b/src/components/navigation/SidebarBase.tsx @@ -8,6 +8,13 @@ export default styled.div` user-select: none; flex-direction: row; align-items: stretch; + /*background: var(--background);*/ + + background-color: rgba( + var(--background-rgb), + max(var(--min-opacity), 0.75) + ); + backdrop-filter: blur(20px); /*> * > ::-webkit-scrollbar-thumb { width: 4px; diff --git a/src/pages/RevoltApp.tsx b/src/pages/RevoltApp.tsx index 345b930b..a6d748d2 100644 --- a/src/pages/RevoltApp.tsx +++ b/src/pages/RevoltApp.tsx @@ -24,12 +24,38 @@ import ChannelSettings from "./settings/ChannelSettings"; import ServerSettings from "./settings/ServerSettings"; import Settings from "./settings/Settings"; +const AppContainer = styled.div` + background-size: cover !important; + background-position: center center !important; +`; + +const StatusBar = styled.div` + height: 40px; + width: 100%; + display: flex; + align-items: center; + justify-content: center; + font-size: 13px; + gap: 14px; + + .button { + border: 1px solid white; + padding: 5px; + border-radius: var(--border-radius); + } +`; + const Routes = styled.div` min-width: 0; display: flex; flex-direction: column; position: relative; background: var(--primary-background); + /*background-color: rgba( + var(--primary-background-rgb), + max(var(--min-opacity), 0.75) + );*/ + //backdrop-filter: blur(10px); `; export default function App() { @@ -44,91 +70,103 @@ export default function App() { return ( <> - {window.isNative && !window.native.getConfig().frame && ( - - )} - } - } - rightPanel={ - !inSpecial && inChannel - ? { width: 236, component: } - : undefined - } - bottomNav={{ - component: , - showIf: fixedBottomNav ? ShowIf.Always : ShowIf.Left, - height: 50, - }} - docked={isTouchscreenDevice ? Docked.None : Docked.Left}> - - - - - - - - + {/* +
Planned outage: CDN (~2 hours)
+
View status
+
*/} + + {window.isNative && !window.native.getConfig().frame && ( + + )} + } + } + rightPanel={ + !inSpecial && inChannel + ? { width: 236, component: } + : undefined + } + bottomNav={{ + component: , + showIf: fixedBottomNav ? ShowIf.Always : ShowIf.Left, + height: 50, + }} + docked={isTouchscreenDevice ? Docked.None : Docked.Left}> + + + + + + + + - - + + - - - + + + - - + + - - - - - - - - - - - - - + + + + + + +
+
+ + + + +
+ ); } diff --git a/src/pages/settings/panes/Appearance.tsx b/src/pages/settings/panes/Appearance.tsx index 748daa4d..a38c9cb8 100644 --- a/src/pages/settings/panes/Appearance.tsx +++ b/src/pages/settings/panes/Appearance.tsx @@ -31,8 +31,8 @@ export const Appearance = observer(() => {

- +