diff --git a/src/components/ThemeSettings/ThemesTab.tsx b/src/components/ThemeSettings/ThemesTab.tsx index ae5f6d13c..d9bcfaa90 100644 --- a/src/components/ThemeSettings/ThemesTab.tsx +++ b/src/components/ThemeSettings/ThemesTab.tsx @@ -20,8 +20,11 @@ import "./themesStyles.css"; import { Settings, useSettings } from "@api/Settings"; import { classNameFactory } from "@api/Styles"; +import { BaseText } from "@components/BaseText"; +import { Divider } from "@components/Divider"; import { ErrorCard } from "@components/ErrorCard"; import { Flex } from "@components/Flex"; +import { Heading } from "@components/Heading"; import { CogWheel, DeleteIcon, FolderIcon, PaintbrushIcon, PencilIcon, PluginIcon, PlusIcon, RestartIcon } from "@components/Icons"; import { Link } from "@components/Link"; import { AddonCard, openPluginModal, QuickAction, QuickActionCard, SettingsTab, wrapTab } from "@components/settings"; @@ -321,7 +324,7 @@ function ThemesTab() { return ( <> - Find Themes: + Find Themes:
BetterDiscord Themes @@ -332,7 +335,7 @@ function ThemesTab() {
- Local Themes + Local Themes <> {IS_WEB ? @@ -465,9 +468,9 @@ function ThemesTab() { return ( <>;
- Online Themes + Online Themes - Make sure to use direct links to files (raw or github.io)! + Make sure to use direct links to files (raw or github.io)! @@ -580,18 +583,18 @@ export function CspErrorCard() { return ( - Blocked Resources - Some images, styles, or fonts were blocked because they come from disallowed domains. - It is highly recommended to move them to GitHub or Imgur. But you may also allow domains if you fully trust them. - + Blocked Resources + Some images, styles, or fonts were blocked because they come from disallowed domains. + It is highly recommended to move them to GitHub or Imgur. But you may also allow domains if you fully trust them. + After allowing a domain, you have to fully close (from tray / task manager) and restart {IS_DISCORD_DESKTOP ? "Discord" : IS_EQUIBOP ? "Equibop" : "Vesktop"} to apply the change. - + - Blocked URLs + Blocked URLs
{errors.map((url, i) => (
- {i !== 0 && } + {i !== 0 && }
{url}
- Volume + Volume - Sound Source + Sound Source
- Search Sounds + Search Sounds setSearchQuery(e)} diff --git a/src/equicordplugins/customTimestamps/index.tsx b/src/equicordplugins/customTimestamps/index.tsx index e8be77807..decd15e59 100644 --- a/src/equicordplugins/customTimestamps/index.tsx +++ b/src/equicordplugins/customTimestamps/index.tsx @@ -7,7 +7,9 @@ import "./style.css"; import { definePluginSettings, useSettings } from "@api/Settings"; +import { Divider } from "@components/Divider"; import ErrorBoundary from "@components/ErrorBoundary"; +import { Heading, HeadingPrimary } from "@components/Heading"; import { Link } from "@components/Link"; import { Devs, EquicordDevs } from "@utils/constants"; import { Margins } from "@utils/margins"; @@ -112,7 +114,7 @@ const TimeRow = (props: TimeRowProps) => { return ( <> - {props.format.name} + {props.format.name} {props.format.description} @@ -198,8 +200,8 @@ const settings = definePluginSettings({
{key === "sameDayFormat" && (
- - Calendar formats + + Calendar formats How to format the [calendar] value if used in the above timestamps. @@ -236,7 +238,7 @@ export default definePlugin({ settings, settingsAboutComponent: () => (
- How to use: + How to use: Moment.js formatting documentation
diff --git a/src/equicordplugins/customUserColors/SetColorModal.tsx b/src/equicordplugins/customUserColors/SetColorModal.tsx index 2fdf260ce..ff03c3d43 100644 --- a/src/equicordplugins/customUserColors/SetColorModal.tsx +++ b/src/equicordplugins/customUserColors/SetColorModal.tsx @@ -6,9 +6,10 @@ import { set } from "@api/DataStore"; import { classNameFactory } from "@api/Styles"; +import { HeadingPrimary, HeadingSecondary } from "@components/Heading"; import { Margins } from "@utils/margins"; import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot } from "@utils/modal"; -import { Button, ColorPicker, Forms, useState } from "@webpack/common"; +import { Button, ColorPicker, useState } from "@webpack/common"; import { colors, DATASTORE_KEY } from "./index"; @@ -46,16 +47,16 @@ export function SetColorModal({ id, modalProps }: { id: string, modalProps: Moda return ( - + Custom Color - +
- + Pick a Color - +
- + Default Directory - + Default download location. If set, the file will always be downloaded in its original format even if alternatives are available. Leave empty to pick a folder and file type each time. diff --git a/src/equicordplugins/fontLoader/index.tsx b/src/equicordplugins/fontLoader/index.tsx index e049a251c..1301545e2 100644 --- a/src/equicordplugins/fontLoader/index.tsx +++ b/src/equicordplugins/fontLoader/index.tsx @@ -7,6 +7,7 @@ import "./styles.css"; import { definePluginSettings } from "@api/Settings"; +import { HeadingSecondary, HeadingTertiary } from "@components/Heading"; import { debounce } from "@shared/debounce"; import { EquicordDevs } from "@utils/constants"; import { Margins } from "@utils/margins"; @@ -131,7 +132,7 @@ function GoogleFontSearch({ onSelect }: { onSelect: (font: GoogleFontMetadata) = return (
- Search Google Fonts + Search Google Fonts Click on any font to apply it. onSelect(font)} >
- {font.displayName} + {font.displayName} The quick brown fox jumps over the lazy dog
{font.authors?.length && ( diff --git a/src/equicordplugins/friendCodes/FriendCodesPanel.tsx b/src/equicordplugins/friendCodes/FriendCodesPanel.tsx index 10e071ab3..6e16ae3cc 100644 --- a/src/equicordplugins/friendCodes/FriendCodesPanel.tsx +++ b/src/equicordplugins/friendCodes/FriendCodesPanel.tsx @@ -6,6 +6,7 @@ import "./styles.css"; +import { HeadingTertiary } from "@components/Heading"; import { copyToClipboard } from "@utils/clipboard"; import { findByPropsLazy } from "@webpack"; import { Button, Flex, Forms, Parser, Text, useEffect, useState } from "@webpack/common"; @@ -41,9 +42,9 @@ function FriendInviteCard({ invite }: { invite: FriendInvite; }) {
- + {invite.code} - + Expires {Parser.parse(``)} • {invite.uses}/{invite.max_uses} uses @@ -97,7 +98,7 @@ export default function FriendCodesPanel() {
diff --git a/src/equicordplugins/gifCollections/index.tsx b/src/equicordplugins/gifCollections/index.tsx index a92f92ad2..a8c9976ad 100644 --- a/src/equicordplugins/gifCollections/index.tsx +++ b/src/equicordplugins/gifCollections/index.tsx @@ -9,7 +9,9 @@ import "./style.css"; import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu"; import { DataStore } from "@api/index"; import { definePluginSettings } from "@api/Settings"; +import { Divider } from "@components/Divider"; import { Flex } from "@components/Flex"; +import { Heading } from "@components/Heading"; import { copyToClipboard } from "@utils/clipboard"; import { Devs, EquicordDevs } from "@utils/constants"; import { ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal"; @@ -173,12 +175,12 @@ export const settings = definePluginSettings({ return (
- Sort Collections - + Sort Collections + Choose a sorting criteria for your collections - +
Sort By
@@ -221,7 +223,7 @@ export const settings = definePluginSettings({
- +
Order
@@ -463,19 +465,19 @@ const RemoveItemContextMenu = ({ type, nameOrId, instance }) => (
- Name + Name {collection.name.replace(/.+?:/, "")} - Gifs + Gifs {collection.gifs.length} - Created At + Created At {collection.createdAt ? new Date(collection.createdAt).toLocaleString() : "Unknown"} - Last Updated + Last Updated {collection.lastUpdated ? new Date(collection.lastUpdated).toLocaleString() : "Unknown"}
@@ -524,15 +526,15 @@ const RemoveItemContextMenu = ({ type, nameOrId, instance }) => (
- Added At + Added At {gifInfo.addedAt ? new Date(gifInfo.addedAt).toLocaleString() : "Unknown"} - Width + Width {gifInfo.width} - Height + Height {gifInfo.height}
@@ -606,9 +608,9 @@ const RemoveItemContextMenu = ({ type, nameOrId, instance }) => ( Move To Collection - + Select a collection to move the item to - +
{cache_collections .filter(col => col.name !== getItemCollectionNameFromId(nameOrId)) @@ -758,7 +760,7 @@ function CreateCollectionModal({ gif, onClose, modalProps }) { Create Collection - Collection Name + Collection Name setName(e)} />
diff --git a/src/equicordplugins/githubRepos/components/GitHubReposComponent.tsx b/src/equicordplugins/githubRepos/components/GitHubReposComponent.tsx index 15ecd326c..d3df5c052 100644 --- a/src/equicordplugins/githubRepos/components/GitHubReposComponent.tsx +++ b/src/equicordplugins/githubRepos/components/GitHubReposComponent.tsx @@ -101,7 +101,7 @@ export function GitHubReposComponent({ id, theme }: { id: string, theme: string;
)}
- + {guild.name} - +