diff --git a/src/components/common/ChannelIcon.tsx b/src/components/common/ChannelIcon.tsx index fb4d1a50..c0d596ed 100644 --- a/src/components/common/ChannelIcon.tsx +++ b/src/components/common/ChannelIcon.tsx @@ -1,6 +1,6 @@ import { useContext } from "preact/hooks"; import { Channels } from "revolt.js/dist/api/objects"; -import { Hash, Volume2 } from "@styled-icons/feather"; +import { Hash, VolumeFull } from "@styled-icons/boxicons-regular"; import { ImageIconBase, IconBaseProps } from "./IconBase"; import { AppContext } from "../../context/revoltjs/RevoltClient"; @@ -21,7 +21,7 @@ export default function ChannelIcon(props: Props & Omit + ) } else { return ( diff --git a/src/components/common/ServerHeader.tsx b/src/components/common/ServerHeader.tsx index e2a89df8..de7a39f6 100644 --- a/src/components/common/ServerHeader.tsx +++ b/src/components/common/ServerHeader.tsx @@ -2,7 +2,7 @@ import Header from "../ui/Header"; import styled from "styled-components"; import { Link } from "react-router-dom"; import IconButton from "../ui/IconButton"; -import { Settings } from "@styled-icons/feather"; +import { Cog } from "@styled-icons/boxicons-solid"; import { Server } from "revolt.js/dist/api/objects"; import { ServerPermission } from "revolt.js/dist/api/permissions"; import { HookContext, useServerPermission } from "../../context/revoltjs/hooks"; @@ -30,7 +30,7 @@ export default function ServerHeader({ server, ctx }: Props) { { (permissions & ServerPermission.ManageServer) > 0 &&
- +
} diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx index ea8391a5..da1fe694 100644 --- a/src/components/common/messaging/MessageBox.tsx +++ b/src/components/common/messaging/MessageBox.tsx @@ -4,7 +4,7 @@ import { Channel } from "revolt.js"; import styled from "styled-components"; import { defer } from "../../../lib/defer"; import IconButton from "../../ui/IconButton"; -import { Send, X } from '@styled-icons/feather'; +import { Send, X } from '@styled-icons/boxicons-regular'; import { debounce } from "../../../lib/debounce"; import Axios, { CancelTokenSource } from "axios"; import { useTranslation } from "../../../lib/i18n"; diff --git a/src/components/common/messaging/attachments/AttachmentActions.tsx b/src/components/common/messaging/attachments/AttachmentActions.tsx index cf701ad8..f667f163 100644 --- a/src/components/common/messaging/attachments/AttachmentActions.tsx +++ b/src/components/common/messaging/attachments/AttachmentActions.tsx @@ -4,7 +4,7 @@ import IconButton from '../../../ui/IconButton'; import { Attachment } from "revolt.js/dist/api/objects"; import { determineFileSize } from '../../../../lib/fileSize'; import { AppContext } from '../../../../context/revoltjs/RevoltClient'; -import { Download, ExternalLink, File, Headphones, Video } from '@styled-icons/feather'; +import { Download, LinkExternal, File, Headphone, Video } from '@styled-icons/boxicons-regular'; interface Props { attachment: Attachment; @@ -30,7 +30,7 @@ export default function AttachmentActions({ attachment }: Props) { - + @@ -43,14 +43,14 @@ export default function AttachmentActions({ attachment }: Props) { case 'Audio': return (
- +
{filename} {filesize}
- +
@@ -58,14 +58,14 @@ export default function AttachmentActions({ attachment }: Props) { case 'Video': return (
-
@@ -73,14 +73,14 @@ export default function AttachmentActions({ attachment }: Props) { default: return (
- +
{filename} {filesize}
- +
diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx index 74952ea2..70195385 100644 --- a/src/components/common/messaging/attachments/MessageReply.tsx +++ b/src/components/common/messaging/attachments/MessageReply.tsx @@ -2,7 +2,7 @@ import { Text } from "preact-i18n"; import UserShort from "../../user/UserShort"; import styled, { css } from "styled-components"; import Markdown from "../../../markdown/Markdown"; -import { CornerUpRight, File } from "@styled-icons/feather"; +import { Reply, File } from "@styled-icons/boxicons-regular"; import { useUser } from "../../../../context/revoltjs/hooks"; import { useRenderState } from "../../../../lib/renderer/Singleton"; @@ -52,7 +52,7 @@ export function MessageReply({ index, channel, id }: Props) { if (!message) { return ( - + ) @@ -62,7 +62,7 @@ export function MessageReply({ index, channel, id }: Props) { return ( - + { message.attachments && message.attachments.length > 0 && } diff --git a/src/components/common/messaging/bars/FilePreview.tsx b/src/components/common/messaging/bars/FilePreview.tsx index 44d94f5f..9f0a98c4 100644 --- a/src/components/common/messaging/bars/FilePreview.tsx +++ b/src/components/common/messaging/bars/FilePreview.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import { CAN_UPLOAD_AT_ONCE, UploadState } from "../MessageBox"; import { useEffect, useState } from 'preact/hooks'; import { determineFileSize } from '../../../../lib/fileSize'; -import { XCircle, Plus, Share, X, FileText } from "@styled-icons/feather"; +import { XCircle, Plus, Share, X, File } from "@styled-icons/boxicons-regular"; interface Props { state: UploadState, @@ -133,7 +133,7 @@ function FileEntry({ file, remove, index }: { file: File, remove?: () => void, i = CAN_UPLOAD_AT_ONCE ? 'fade' : ''}> - +
diff --git a/src/components/common/messaging/bars/JumpToBottom.tsx b/src/components/common/messaging/bars/JumpToBottom.tsx index 14b9a973..ff0f5278 100644 --- a/src/components/common/messaging/bars/JumpToBottom.tsx +++ b/src/components/common/messaging/bars/JumpToBottom.tsx @@ -1,6 +1,6 @@ import { Text } from "preact-i18n"; import styled from "styled-components"; -import { ArrowDown } from "@styled-icons/feather"; +import { DownArrow } from "@styled-icons/boxicons-regular"; import { SingletonMessageRenderer, useRenderState } from "../../../../lib/renderer/Singleton"; const Bar = styled.div` @@ -46,7 +46,7 @@ export default function JumpToBottom({ id }: { id: string }) {
SingletonMessageRenderer.jumpToBottom(id, true)}>
-
+
) diff --git a/src/components/common/messaging/bars/ReplyBar.tsx b/src/components/common/messaging/bars/ReplyBar.tsx index bfc550e4..7ef64173 100644 --- a/src/components/common/messaging/bars/ReplyBar.tsx +++ b/src/components/common/messaging/bars/ReplyBar.tsx @@ -9,7 +9,7 @@ import { Reply } from "../../../../redux/reducers/queue"; import { useUsers } from "../../../../context/revoltjs/hooks"; import { internalSubscribe } from "../../../../lib/eventEmitter"; import { useRenderState } from "../../../../lib/renderer/Singleton"; -import { AtSign, CornerUpRight, File, XCircle } from "@styled-icons/feather"; +import { At, Reply as ReplyIcon, File, XCircle } from "@styled-icons/boxicons-regular"; interface Props { channel: string, @@ -71,7 +71,7 @@ export default function ReplyBar({ channel, replies, setReplies }: Props) { return ( - + { message.attachments && message.attachments.length > 0 && } @@ -79,7 +79,7 @@ export default function ReplyBar({ channel, replies, setReplies }: Props) { setReplies(replies.map((_, i) => i === index ? { ..._, mention: !_.mention } : _))}> - { reply.mention ? 'ON' : 'OFF' } + { reply.mention ? 'ON' : 'OFF' } setReplies(replies.filter((_, i) => i !== index))}> diff --git a/src/components/common/messaging/embed/EmbedMediaActions.tsx b/src/components/common/messaging/embed/EmbedMediaActions.tsx index 9c119443..ab3d7144 100644 --- a/src/components/common/messaging/embed/EmbedMediaActions.tsx +++ b/src/components/common/messaging/embed/EmbedMediaActions.tsx @@ -1,6 +1,6 @@ import styles from './Embed.module.scss'; import IconButton from '../../../ui/IconButton'; -import { ExternalLink } from '@styled-icons/feather'; +import { LinkExternal } from '@styled-icons/boxicons-regular'; import { EmbedImage } from "revolt.js/dist/api/objects"; interface Props { @@ -18,7 +18,7 @@ export default function EmbedMediaActions({ embed }: Props) { - + diff --git a/src/components/common/user/UserHeader.tsx b/src/components/common/user/UserHeader.tsx index 848e8ce8..dcd7630c 100644 --- a/src/components/common/user/UserHeader.tsx +++ b/src/components/common/user/UserHeader.tsx @@ -8,7 +8,7 @@ import styled from "styled-components"; import { Localizer } from 'preact-i18n'; import { Link } from "react-router-dom"; import IconButton from "../../ui/IconButton"; -import { Settings } from "@styled-icons/feather"; +import { Cog } from "@styled-icons/boxicons-solid"; import { openContextMenu } from "preact-context-menu"; import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice"; import { useIntermediate } from "../../../context/intermediate/Intermediate"; @@ -76,7 +76,7 @@ export default function UserHeader({ user }: Props) { { !isTouchscreenDevice &&
- +
} diff --git a/src/components/common/user/UserIcon.tsx b/src/components/common/user/UserIcon.tsx index 65418b71..85064c54 100644 --- a/src/components/common/user/UserIcon.tsx +++ b/src/components/common/user/UserIcon.tsx @@ -1,6 +1,6 @@ import { User } from "revolt.js"; import { useContext } from "preact/hooks"; -import { MicOff } from "@styled-icons/feather"; +import { MicrophoneOff } from "@styled-icons/boxicons-regular"; import styled, { css } from "styled-components"; import { Users } from "revolt.js/dist/api/objects"; import { ThemeContext } from "../../../context/Theme"; @@ -83,7 +83,7 @@ export default function UserIcon(props: Props & Omit - {props.voice === "muted" && } + {props.voice === "muted" && } )} diff --git a/src/components/navigation/BottomNavigation.tsx b/src/components/navigation/BottomNavigation.tsx index 4afa8f9b..c88fa2d3 100644 --- a/src/components/navigation/BottomNavigation.tsx +++ b/src/components/navigation/BottomNavigation.tsx @@ -4,7 +4,7 @@ import styled, { css } from "styled-components"; import { useSelf } from "../../context/revoltjs/hooks"; import { useHistory, useLocation } from "react-router"; import ConditionalLink from "../../lib/ConditionalLink"; -import { MessageCircle, Users } from "@styled-icons/feather"; +import { MessageRounded, Group } from "@styled-icons/boxicons-regular"; const NavigationBase = styled.div` z-index: 10; @@ -50,13 +50,13 @@ export default function BottomNavigation() { } } }}> - +
diff --git a/src/components/navigation/items/ButtonItem.tsx b/src/components/navigation/items/ButtonItem.tsx index d4e19820..6f82c5d3 100644 --- a/src/components/navigation/items/ButtonItem.tsx +++ b/src/components/navigation/items/ButtonItem.tsx @@ -3,7 +3,7 @@ import styles from "./Item.module.scss"; import Tooltip from '../../common/Tooltip'; import IconButton from '../../ui/IconButton'; import { Localizer, Text } from "preact-i18n"; -import { X, Zap } from "@styled-icons/feather"; +import { X, Crown } from "@styled-icons/boxicons-regular"; import { Children } from "../../../types/Preact"; import UserIcon from '../../common/user/UserIcon'; import ChannelIcon from '../../common/ChannelIcon'; @@ -65,7 +65,7 @@ export function UserButton({ active, alert, alertCount, user, context, channel } } > - + )} diff --git a/src/components/navigation/left/HomeSidebar.tsx b/src/components/navigation/left/HomeSidebar.tsx index d9ea7190..13daf264 100644 --- a/src/components/navigation/left/HomeSidebar.tsx +++ b/src/components/navigation/left/HomeSidebar.tsx @@ -1,6 +1,6 @@ import { Localizer, Text } from "preact-i18n"; import { useContext, useEffect } from "preact/hooks"; -import { Home, Users, Tool, Save } from "@styled-icons/feather"; +import { Home, Group, Wrench, Save } from "@styled-icons/boxicons-regular"; import Category from '../../ui/Category'; import PaintCounter from "../../../lib/PaintCounter"; @@ -83,7 +83,7 @@ function HomeSidebar(props: Props) { ) !== "undefined" ? 'unread' : undefined } > - + @@ -98,7 +98,7 @@ function HomeSidebar(props: Props) { {import.meta.env.DEV && ( - + diff --git a/src/components/navigation/left/ServerListSidebar.tsx b/src/components/navigation/left/ServerListSidebar.tsx index 4f25f7dd..75d47256 100644 --- a/src/components/navigation/left/ServerListSidebar.tsx +++ b/src/components/navigation/left/ServerListSidebar.tsx @@ -4,7 +4,7 @@ import { mapChannelWithUnread } from "./common"; import styled, { css } from "styled-components"; import ServerIcon from "../../common/ServerIcon"; import { Children } from "../../../types/Preact"; -import { PlusCircle } from "@styled-icons/feather"; +import { Plus } from "@styled-icons/boxicons-regular"; import PaintCounter from "../../../lib/PaintCounter"; import { attachContextMenu } from 'preact-context-menu'; import { connectState } from "../../../redux/connector"; @@ -51,7 +51,7 @@ function Icon({ children, unread, size }: { children: Children, unread?: 'mentio } const ServersBase = styled.div` - width: 52px; + width: 72px; height: 100%; display: flex; flex-direction: column; @@ -183,7 +183,7 @@ export function ServerListSidebar({ unreads, lastOpened }: Props) { }) } openScreen({ id: 'special_input', type: 'create_server' })}> - + diff --git a/src/components/ui/Category.tsx b/src/components/ui/Category.tsx index 4b671225..2889e2f4 100644 --- a/src/components/ui/Category.tsx +++ b/src/components/ui/Category.tsx @@ -1,6 +1,6 @@ import styled, { css } from "styled-components"; import { Children } from "../../types/Preact"; -import { Plus } from "@styled-icons/feather"; +import { Plus } from "@styled-icons/boxicons-regular"; const CategoryBase = styled.div>` font-size: 12px; diff --git a/src/components/ui/Checkbox.tsx b/src/components/ui/Checkbox.tsx index e7cd62b9..32020bac 100644 --- a/src/components/ui/Checkbox.tsx +++ b/src/components/ui/Checkbox.tsx @@ -1,4 +1,4 @@ -import { Check } from "@styled-icons/feather"; +import { Check } from "@styled-icons/boxicons-regular"; import { Children } from "../../types/Preact"; import styled, { css } from "styled-components"; @@ -59,7 +59,6 @@ const Checkmark = styled.div<{ checked: boolean }>` svg { color: var(--secondary-background); - stroke-width: 2; } ${(props) => diff --git a/src/components/ui/ColourSwatches.tsx b/src/components/ui/ColourSwatches.tsx index e6e2478e..cbc13bd2 100644 --- a/src/components/ui/ColourSwatches.tsx +++ b/src/components/ui/ColourSwatches.tsx @@ -1,7 +1,6 @@ import { useRef } from "preact/hooks"; -import { Check } from "@styled-icons/feather"; +import { Check, Pencil } from "@styled-icons/boxicons-regular"; import styled, { css } from "styled-components"; -import { Pencil } from "@styled-icons/bootstrap"; interface Props { value: string; @@ -68,7 +67,7 @@ const Swatch = styled.div<{ type: "small" | "large"; colour: string }>` height: 30px; svg { - stroke-width: 2; + /*stroke-width: 2;*/ } ` : css` @@ -118,7 +117,7 @@ export default function ColourSwatches({ value, onChange }: Props) { onClick={() => onChange(swatch)} > {swatch === value && ( - + )} ))} diff --git a/src/components/ui/IconButton.tsx b/src/components/ui/IconButton.tsx index 497f287c..a0c75784 100644 --- a/src/components/ui/IconButton.tsx +++ b/src/components/ui/IconButton.tsx @@ -15,7 +15,7 @@ export default styled.div` fill: ${normal}; color: ${normal}; - stroke: ${normal}; + /*stroke: ${normal};*/ a { color: ${normal}; @@ -24,7 +24,7 @@ export default styled.div` &:hover { fill: ${hover}; color: ${hover}; - stroke: ${hover}; + /*stroke: ${hover};*/ a { color: ${hover}; diff --git a/src/components/ui/Radio.tsx b/src/components/ui/Radio.tsx index d6beb9a4..e988bbc9 100644 --- a/src/components/ui/Radio.tsx +++ b/src/components/ui/Radio.tsx @@ -1,6 +1,6 @@ import { Children } from "../../types/Preact"; import styled, { css } from "styled-components"; -import { CircleFill } from "@styled-icons/bootstrap"; +import { Circle } from "@styled-icons/boxicons-regular"; interface Props { children: Children; @@ -48,7 +48,7 @@ const RadioBase = styled.label` svg { color: var(--foreground); - stroke-width: 2; + /*stroke-width: 2;*/ } } @@ -95,7 +95,7 @@ export default function Radio(props: Props) { } >
- +
diff --git a/src/components/ui/Tip.tsx b/src/components/ui/Tip.tsx index b65ccc65..5ca87834 100644 --- a/src/components/ui/Tip.tsx +++ b/src/components/ui/Tip.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Info } from "@styled-icons/feather"; +import { InfoCircle } from "@styled-icons/boxicons-regular"; import { Children } from "../../types/Preact"; export const TipBase = styled.div` @@ -29,7 +29,7 @@ export const TipBase = styled.div` export default function Tip(props: { children: Children }) { return ( - + {props.children} ); diff --git a/src/context/intermediate/popovers/ChannelInfo.tsx b/src/context/intermediate/popovers/ChannelInfo.tsx index 2abce2fc..8b0b7ddb 100644 --- a/src/context/intermediate/popovers/ChannelInfo.tsx +++ b/src/context/intermediate/popovers/ChannelInfo.tsx @@ -1,4 +1,4 @@ -import { X } from "@styled-icons/feather"; +import { X } from "@styled-icons/boxicons-regular"; import styles from "./ChannelInfo.module.scss"; import Modal from "../../../components/ui/Modal"; import { getChannelName } from "../../revoltjs/util"; diff --git a/src/context/intermediate/popovers/UserProfile.tsx b/src/context/intermediate/popovers/UserProfile.tsx index afcc8345..22167c5c 100644 --- a/src/context/intermediate/popovers/UserProfile.tsx +++ b/src/context/intermediate/popovers/UserProfile.tsx @@ -6,7 +6,6 @@ import Modal from "../../../components/ui/Modal"; import { Route } from "revolt.js/dist/api/routes"; import { Users } from "revolt.js/dist/api/objects"; import { useIntermediate } from "../Intermediate"; -import { CashStack } from "@styled-icons/bootstrap"; import Preloader from "../../../components/ui/Preloader"; import Tooltip from '../../../components/common/Tooltip'; import IconButton from "../../../components/ui/IconButton"; @@ -15,7 +14,7 @@ import { UserPermission } from "revolt.js/dist/api/permissions"; import UserIcon from '../../../components/common/user/UserIcon'; import ChannelIcon from '../../../components/common/ChannelIcon'; import UserStatus from '../../../components/common/user/UserStatus'; -import { Mail, Edit, UserPlus, Shield } from "@styled-icons/feather"; +import { Envelope, Edit, UserPlus, Shield, Money } from "@styled-icons/boxicons-regular"; import { useContext, useEffect, useLayoutEffect, useState } from "preact/hooks"; import { AppContext, ClientStatus, StatusContext } from "../../revoltjs/RevoltClient"; import { useChannels, useForceUpdate, useUserPermission, useUsers } from "../../revoltjs/hooks"; @@ -160,7 +159,7 @@ export function UserProfile({ user_id, onClose, dummy, dummyProfile }: Props) { onClose(); history.push(`/open/${user_id}`); }}> - + @@ -172,13 +171,13 @@ export function UserProfile({ user_id, onClose, dummy, dummyProfile }: Props) { if (dummy) return; history.push(`/settings/profile`); }}> - + )} {(user.relationship === Users.Relationship.Incoming || user.relationship === Users.Relationship.None) && ( client.users.addFriend(user.username)}> - + )} @@ -255,7 +254,7 @@ export function UserProfile({ user_id, onClose, dummy, dummyProfile }: Props) { } > - + ) : ( <> diff --git a/src/context/revoltjs/FileUploads.tsx b/src/context/revoltjs/FileUploads.tsx index 4be51c16..ab9156b0 100644 --- a/src/context/revoltjs/FileUploads.tsx +++ b/src/context/revoltjs/FileUploads.tsx @@ -8,7 +8,7 @@ import { useContext, useEffect, useState } from "preact/hooks"; import Preloader from "../../components/ui/Preloader"; import { determineFileSize } from "../../lib/fileSize"; import IconButton from '../../components/ui/IconButton'; -import { Edit, Plus, X, XCircle } from "@styled-icons/feather"; +import { Edit, Plus, X, XCircle } from "@styled-icons/boxicons-regular"; import { useIntermediate } from "../intermediate/Intermediate"; type Props = { diff --git a/src/context/revoltjs/RequiresOnline.tsx b/src/context/revoltjs/RequiresOnline.tsx index 20779e5f..ff2dd199 100644 --- a/src/context/revoltjs/RequiresOnline.tsx +++ b/src/context/revoltjs/RequiresOnline.tsx @@ -2,7 +2,7 @@ import { Text } from "preact-i18n"; import styled from "styled-components"; import { useContext } from "preact/hooks"; import { Children } from "../../types/Preact"; -import { WifiOff } from "@styled-icons/feather"; +import { WifiOff } from "@styled-icons/boxicons-regular"; import Preloader from "../../components/ui/Preloader"; import { ClientStatus, StatusContext } from "./RevoltClient"; diff --git a/src/lib/ContextMenus.tsx b/src/lib/ContextMenus.tsx index 3636bdff..c1844451 100644 --- a/src/lib/ContextMenus.tsx +++ b/src/lib/ContextMenus.tsx @@ -19,9 +19,8 @@ import { Children } from "../types/Preact"; import LineDivider from "../components/ui/LineDivider"; import { connectState } from "../redux/connector"; import { internalEmit } from "./eventEmitter"; -import { AtSign, Bell, BellOff, Check, CheckSquare, ChevronRight, Slash, Square } from "@styled-icons/feather"; +import { At, Bell, BellOff, Check, CheckSquare, ChevronRight, Block, Square, LeftArrowAlt } from "@styled-icons/boxicons-regular"; import { getNotificationState, Notifications, NotificationState } from "../redux/reducers/notifications"; -import { ArrowLeft } from "@styled-icons/bootstrap"; interface ContextMenuData { user?: string; @@ -718,16 +717,16 @@ function ContextMenus(props: Props) { { icon } - { (state === undefined && actual === key) &&
} + { (state === undefined && actual === key) &&
} { (state === key) &&
}
); } generate('all', ); - generate('mention', ); + generate('mention', ); generate('muted', ); - generate('none', ); + generate('none', ); return elements; }} diff --git a/src/pages/channels/ChannelHeader.tsx b/src/pages/channels/ChannelHeader.tsx index 24a23f3f..6834c18b 100644 --- a/src/pages/channels/ChannelHeader.tsx +++ b/src/pages/channels/ChannelHeader.tsx @@ -7,7 +7,7 @@ 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, AtSign, Users, Hash } from "@styled-icons/feather"; +import { Save, At, Group, Hash } from "@styled-icons/boxicons-regular"; import { useStatusColour } from "../../components/common/user/UserIcon"; import { useIntermediate } from "../../context/intermediate/Intermediate"; @@ -57,18 +57,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/channels/actions/HeaderActions.tsx b/src/pages/channels/actions/HeaderActions.tsx index 368f603f..d3f7eeea 100644 --- a/src/pages/channels/actions/HeaderActions.tsx +++ b/src/pages/channels/actions/HeaderActions.tsx @@ -6,7 +6,7 @@ import { AppContext } from "../../../context/revoltjs/RevoltClient"; import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice"; import { useIntermediate } from "../../../context/intermediate/Intermediate"; import { VoiceContext, VoiceOperationsContext, VoiceStatus } from "../../../context/Voice"; -import { UserPlus, Settings, Sidebar as SidebarIcon, PhoneCall, PhoneOff } from "@styled-icons/feather"; +import { UserPlus, Cog, Sidebar as SidebarIcon, PhoneCall, PhoneOutgoing } from "@styled-icons/boxicons-regular"; export default function HeaderActions({ channel, toggleSidebar }: ChannelHeaderProps) { const { openScreen } = useIntermediate(); @@ -30,7 +30,7 @@ export default function HeaderActions({ channel, toggleSidebar }: ChannelHeaderP history.push(`/channel/${channel._id}/settings`)}> - + ) } @@ -55,7 +55,7 @@ function VoiceActions({ channel }: Pick) { if (voice.roomId === channel._id) { return ( - + ) } else { diff --git a/src/pages/channels/voice/VoiceHeader.tsx b/src/pages/channels/voice/VoiceHeader.tsx index b99b0f0b..d20a6c32 100644 --- a/src/pages/channels/voice/VoiceHeader.tsx +++ b/src/pages/channels/voice/VoiceHeader.tsx @@ -1,7 +1,7 @@ import { Text } from "preact-i18n"; import styled from "styled-components"; import { useContext } from "preact/hooks"; -import { BarChart } from "@styled-icons/bootstrap"; +import { BarChart } from "@styled-icons/boxicons-regular"; import Button from "../../../components/ui/Button"; import UserIcon from "../../../components/common/user/UserIcon"; import { useForceUpdate, useSelf, useUsers } from "../../../context/revoltjs/hooks"; @@ -93,7 +93,7 @@ export default function VoiceHeader({ id }: Props) { )}
- + { status === VoiceStatus.CONNECTED && }
@@ -145,7 +145,7 @@ export default function VoiceHeader({ id }: Props) { )}
- + { voice.status === VoiceStatus.CONNECTED && }
diff --git a/src/pages/friends/Friend.tsx b/src/pages/friends/Friend.tsx index bcacd299..a33c342d 100644 --- a/src/pages/friends/Friend.tsx +++ b/src/pages/friends/Friend.tsx @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; import styles from "./Friend.module.scss"; import { useContext } from "preact/hooks"; import { Children } from "../../types/Preact"; -import { X, Plus, Mail } from "@styled-icons/feather"; +import { X, Plus, Envelope } from "@styled-icons/boxicons-regular"; import IconButton from "../../components/ui/IconButton"; import { attachContextMenu } from "preact-context-menu"; import { User, Users } from "revolt.js/dist/api/objects"; @@ -30,7 +30,7 @@ export function Friend({ user }: Props) { - + ); diff --git a/src/pages/friends/Friends.tsx b/src/pages/friends/Friends.tsx index 9460f8e4..c331f34a 100644 --- a/src/pages/friends/Friends.tsx +++ b/src/pages/friends/Friends.tsx @@ -1,5 +1,5 @@ import styles from "./Friend.module.scss"; -import { UserPlus } from "@styled-icons/feather"; +import { UserPlus } from "@styled-icons/boxicons-regular"; import { Friend } from "./Friend"; import { Text } from "preact-i18n"; diff --git a/src/pages/invite/Invite.tsx b/src/pages/invite/Invite.tsx index 080f3cbd..8fc2a1f3 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 { ArrowLeft } from "@styled-icons/feather"; +import { LeftArrowAlt } 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/login/forms/Form.tsx b/src/pages/login/forms/Form.tsx index 5d8911b3..d1e0e8c4 100644 --- a/src/pages/login/forms/Form.tsx +++ b/src/pages/login/forms/Form.tsx @@ -5,7 +5,7 @@ import styles from "../Login.module.scss"; import { useForm } from "react-hook-form"; import { MailProvider } from "./MailProvider"; import { useContext, useState } from "preact/hooks"; -import { CheckCircle, Mail } from "@styled-icons/feather"; +import { CheckCircle, Envelope } from "@styled-icons/boxicons-regular"; import { takeError } from "../../../context/revoltjs/util"; import { CaptchaBlock, CaptchaProps } from "./CaptchaBlock"; import { AppContext } from "../../../context/revoltjs/RevoltClient"; @@ -109,7 +109,7 @@ export function Form({ page, callback }: Props) {
{client.configuration?.features.email ? ( <> - +

diff --git a/src/pages/settings/ChannelSettings.tsx b/src/pages/settings/ChannelSettings.tsx index cd4b0f47..4039779e 100644 --- a/src/pages/settings/ChannelSettings.tsx +++ b/src/pages/settings/ChannelSettings.tsx @@ -1,5 +1,5 @@ import { Text } from "preact-i18n"; -import { List } from "@styled-icons/feather"; +import { ListUl } from "@styled-icons/boxicons-regular"; import Category from "../../components/ui/Category"; import { GenericSettings } from "./GenericSettings"; import { getChannelName } from "../../context/revoltjs/util"; @@ -30,7 +30,7 @@ export default function ChannelSettings() { { category: , id: 'overview', - icon: , + icon: , title: } ]} diff --git a/src/pages/settings/GenericSettings.tsx b/src/pages/settings/GenericSettings.tsx index 89579f4c..e32c7939 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 { ArrowLeft, X, XCircle } from "@styled-icons/feather"; +import { LeftArrowAlt, 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()}> - + , id: 'overview', - icon: , + icon: , title: }, { id: 'members', - icon: , + icon: , title: "Members" }, { id: 'invites', - icon: , + icon: , title: "Invites" }, { id: 'bans', - icon: , + icon: , title: "Bans" } ]} diff --git a/src/pages/settings/Settings.tsx b/src/pages/settings/Settings.tsx index 58be985a..76e99e21 100644 --- a/src/pages/settings/Settings.tsx +++ b/src/pages/settings/Settings.tsx @@ -10,16 +10,16 @@ import { Bell, Box, Coffee, - Gitlab, Globe, Image, LogOut, - RefreshCw, + Sync as SyncIcon, Shield, ToggleRight, User -} from "@styled-icons/feather"; -import { Megaphone } from "@styled-icons/bootstrap"; +} from "@styled-icons/boxicons-regular"; +import { Megaphone } from "@styled-icons/boxicons-solid"; +import { Gitlab } from "@styled-icons/boxicons-logos"; import { GIT_BRANCH, GIT_REVISION, REPO_URL } from "../../revision"; import LineDivider from "../../components/ui/LineDivider"; import RequiresOnline from "../../context/revoltjs/RequiresOnline"; @@ -54,49 +54,49 @@ export default function Settings() { { category: , id: 'account', - icon: , + icon: , title: }, { id: 'profile', - icon: , + icon: , title: }, { id: 'sessions', - icon: , + icon: , title: }, { category: , id: 'appearance', - icon: , + icon: , title: }, { id: 'notifications', - icon: , + icon: , title: }, { id: 'language', - icon: , + icon: , title: }, { id: 'sync', - icon: , + icon: , title: }, { divider: true, id: 'experiments', - icon: , + icon: , title: }, { id: 'feedback', - icon: , + icon: , title: } ]} @@ -122,13 +122,13 @@ export default function Settings() { target="_blank" > - + , - + , @@ -138,7 +138,7 @@ export default function Settings() { className={styles.logOut} compact > - + ,
diff --git a/src/pages/settings/panes/Account.tsx b/src/pages/settings/panes/Account.tsx index b3f7e61c..1fc80c25 100644 --- a/src/pages/settings/panes/Account.tsx +++ b/src/pages/settings/panes/Account.tsx @@ -5,7 +5,7 @@ import Button from "../../../components/ui/Button"; import { Users } from "revolt.js/dist/api/objects"; import { Link, useHistory } from "react-router-dom"; import Overline from "../../../components/ui/Overline"; -import { AtSign, Key, Mail } from "@styled-icons/feather"; +import { At, Key, Envelope } from "@styled-icons/boxicons-regular"; import { useContext, useEffect, useState } from "preact/hooks"; import UserIcon from "../../../components/common/user/UserIcon"; import { useForceUpdate, useSelf } from "../../../context/revoltjs/hooks"; @@ -54,8 +54,8 @@ export function Account() {
{[ - ["username", user.username, ], - ["email", email, ], + ["username", user.username, ], + ["email", email, ], ["password", "*****", ] ].map(([field, value, icon]) => (
diff --git a/src/pages/settings/panes/Sessions.tsx b/src/pages/settings/panes/Sessions.tsx index e0501d7f..b9bccc4b 100644 --- a/src/pages/settings/panes/Sessions.tsx +++ b/src/pages/settings/panes/Sessions.tsx @@ -9,7 +9,7 @@ import Preloader from "../../../components/ui/Preloader"; import { useContext, useEffect, useState } from "preact/hooks"; import { AppContext } from "../../../context/revoltjs/RevoltClient"; -import { HelpCircle } from "@styled-icons/feather"; +import { HelpCircle } from "@styled-icons/boxicons-regular"; import { Android, Firefoxbrowser, diff --git a/src/pages/settings/server/Invites.tsx b/src/pages/settings/server/Invites.tsx index 21e03370..1b372357 100644 --- a/src/pages/settings/server/Invites.tsx +++ b/src/pages/settings/server/Invites.tsx @@ -1,5 +1,5 @@ import styles from './Panes.module.scss'; -import { XCircle } from "@styled-icons/feather"; +import { XCircle } from "@styled-icons/boxicons-regular"; import { useEffect, useState } from "preact/hooks"; import Preloader from "../../../components/ui/Preloader"; import IconButton from "../../../components/ui/IconButton";