diff --git a/src/components/navigation/BottomNavigation.tsx b/src/components/navigation/BottomNavigation.tsx index 7faa1a00..675659c3 100644 --- a/src/components/navigation/BottomNavigation.tsx +++ b/src/components/navigation/BottomNavigation.tsx @@ -7,7 +7,7 @@ import ConditionalLink from "../../lib/ConditionalLink"; import { Message, Group } from "@styled-icons/boxicons-regular"; const NavigationBase = styled.div` - z-index: 10; + z-index: 100; height: 50px; display: flex; background: var(--secondary-background); diff --git a/src/pages/channels/ChannelHeader.tsx b/src/pages/channels/ChannelHeader.tsx index 6508cb6f..d4a91217 100644 --- a/src/pages/channels/ChannelHeader.tsx +++ b/src/pages/channels/ChannelHeader.tsx @@ -7,7 +7,8 @@ import Markdown from "../../components/markdown/Markdown"; import { getChannelName } from "../../context/revoltjs/util"; import UserStatus from "../../components/common/user/UserStatus"; import { AppContext } from "../../context/revoltjs/RevoltClient"; -import { Save, At, Group, Hash } from "@styled-icons/boxicons-regular"; +import { At, Hash } from "@styled-icons/boxicons-regular"; +import { Save, Group } from "@styled-icons/boxicons-solid"; import { useStatusColour } from "../../components/common/user/UserIcon"; import { useIntermediate } from "../../context/intermediate/Intermediate"; @@ -61,18 +62,18 @@ export default function ChannelHeader({ channel, toggleSidebar }: ChannelHeaderP let icon, recipient; switch (channel.channel_type) { case "SavedMessages": - icon = ; + icon = ; break; case "DirectMessage": - icon = ; + icon = ; const uid = client.channels.getRecipient(channel._id); recipient = client.users.get(uid); break; case "Group": - icon = ; + icon = ; break; case "TextChannel": - icon = ; + icon = ; break; } diff --git a/src/pages/friends/Friend.module.scss b/src/pages/friends/Friend.module.scss index a8183e51..3021e9af 100644 --- a/src/pages/friends/Friend.module.scss +++ b/src/pages/friends/Friend.module.scss @@ -10,6 +10,8 @@ background: var(--primary-background); padding: 8px 0; z-index: 10; + + } &[data-empty="true"] { @@ -28,11 +30,11 @@ } .friend { - padding: 10px; + padding: 0 10px; + height: 60px; display: flex; border-radius: 5px; align-items: center; - flex-direction: row; cursor: pointer; &:hover { @@ -47,7 +49,7 @@ flex-grow: 1; margin: 0 12px; font-size: 16px; - + font-weight: 600; display: flex; flex-direction: column; text-overflow: ellipsis; @@ -61,6 +63,7 @@ .subtext { font-size: 12px; + font-weight: 400; color: var(--tertiary-foreground); white-space: nowrap; overflow: hidden; @@ -73,8 +76,8 @@ gap: 12px; .button { - width: 40px; - height: 40px; + width: 36px; + height: 36px; &:hover.error { background: var(--error); @@ -91,6 +94,10 @@ .list { padding: 0 12px 12px 12px; } + + .call { + display: none; + } } diff --git a/src/pages/friends/Friend.tsx b/src/pages/friends/Friend.tsx index 2befba18..74b33a24 100644 --- a/src/pages/friends/Friend.tsx +++ b/src/pages/friends/Friend.tsx @@ -33,7 +33,7 @@ export function Friend({ user }: Props) { actions.push( <> stopPropagation(ev, openDM(user._id).then(connect))}> diff --git a/src/pages/home/Home.tsx b/src/pages/home/Home.tsx index eaa763de..d45e15b5 100644 --- a/src/pages/home/Home.tsx +++ b/src/pages/home/Home.tsx @@ -3,13 +3,16 @@ import { Link } from "react-router-dom"; import { Text } from "preact-i18n"; import Header from "../../components/ui/Header"; - +import { Home as HomeIcon } from "@styled-icons/boxicons-solid"; import wideSVG from '../../assets/wide.svg'; export default function Home() { return (
-
+
+ + +

diff --git a/src/pages/invite/Invite.tsx b/src/pages/invite/Invite.tsx index 8fc2a1f3..e05bcdf3 100644 --- a/src/pages/invite/Invite.tsx +++ b/src/pages/invite/Invite.tsx @@ -1,6 +1,6 @@ import styles from './Invite.module.scss'; import Button from '../../components/ui/Button'; -import { LeftArrowAlt } from "@styled-icons/boxicons-regular"; +import { ArrowBack } from "@styled-icons/boxicons-regular"; import Overline from '../../components/ui/Overline'; import { Invites } from "revolt.js/dist/api/objects"; import Preloader from '../../components/ui/Preloader'; @@ -44,7 +44,7 @@ export default function Invite() { return (
- history.push('/')} /> + history.push('/')} />
{ !processing && diff --git a/src/pages/settings/GenericSettings.tsx b/src/pages/settings/GenericSettings.tsx index 151a6ada..a3700603 100644 --- a/src/pages/settings/GenericSettings.tsx +++ b/src/pages/settings/GenericSettings.tsx @@ -6,7 +6,7 @@ import Header from '../../components/ui/Header'; import Category from '../../components/ui/Category'; import IconButton from "../../components/ui/IconButton"; import LineDivider from "../../components/ui/LineDivider"; -import { LeftArrowAlt, X, XCircle } from "@styled-icons/boxicons-regular"; +import { ArrowBack, X, XCircle } from "@styled-icons/boxicons-regular"; import { Switch, useHistory, useParams } from "react-router-dom"; import { isTouchscreenDevice } from "../../lib/isTouchscreenDevice"; import ButtonItem from "../../components/navigation/items/ButtonItem"; @@ -65,7 +65,7 @@ export function GenericSettings({ pages, switchPage, category, custom, children, ) : ( <> switchPage()}> - +