ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

feat: make the color picker look prettier based on switch

Browse source
This commit is contained in:
Lewis Crichton 2023-09-25 18:27:49 +01:00
parent 1179a9f5a1
commit 4325dcf02e
No known key found for this signature in database
3 changed files with 42 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/ThemeSettings/ThemesTab.tsx
View file

@ -22,6 +22,7 @@ import { Settings, useSettings } from "@api/Settings";
import { classNameFactory } from "@api/Styles"; import { classNameFactory } from "@api/Styles";
import { ErrorCard } from "@components/ErrorCard"; import { ErrorCard } from "@components/ErrorCard";
import { Flex } from "@components/Flex"; import { Flex } from "@components/Flex";
import { CogWheel } from "@components/Icons";
import { Link } from "@components/Link"; import { Link } from "@components/Link";
import { AddonCard } from "@components/VencordSettings/AddonCard"; import { AddonCard } from "@components/VencordSettings/AddonCard";
import { SettingsTab, wrapTab } from "@components/VencordSettings/shared"; import { SettingsTab, wrapTab } from "@components/VencordSettings/shared";
@ -52,7 +53,6 @@ type FileInput = ComponentType<{
const InviteActions = findByPropsLazy("resolveInvite"); const InviteActions = findByPropsLazy("resolveInvite");
const TrashIcon = findByCodeLazy("M5 6.99902V18.999C5 20.101 5.897 20.999"); const TrashIcon = findByCodeLazy("M5 6.99902V18.999C5 20.101 5.897 20.999");
const CogWheel = findByCodeLazy("18.564C15.797 19.099 14.932 19.498 14 19.738V22H10V19.738C9.069");
const FileInput: FileInput = findByCodeLazy("activateUploadDialogue="); const FileInput: FileInput = findByCodeLazy("activateUploadDialogue=");
const TextAreaProps = findLazy(m => typeof m.textarea === "string"); const TextAreaProps = findLazy(m => typeof m.textarea === "string");

24
src/components/ThemeSettings/components/SettingColorComponent.tsx
View file

@ -24,7 +24,15 @@ const TinyColor: tinycolor.Constructor = findByCodeLazy("this._gradientType=");
const cl = classNameFactory("vc-usercss-settings-color-"); const cl = classNameFactory("vc-usercss-settings-color-");
const EditPencil = findByCodeLazy("M19.2929 9.8299L19.9409 9.18278C21.353 7.77064", '["color","height","width"]'); // const EditPencil = findByCodeLazy("M19.2929 9.8299L19.9409 9.18278C21.353 7.77064", '["color","height","width"]');
function EditPencil({ className, color }) {
return (
<svg viewBox="0 0 24 24" className={className}>
<path fillRule="evenodd" clipRule="evenodd" d="M19.2929 9.8299L19.9409 9.18278C21.353 7.77064 21.353 5.47197 19.9409 4.05892C18.5287 2.64678 16.2292 2.64678 14.817 4.05892L14.1699 4.70694L19.2929 9.8299ZM12.8962 5.97688L5.18469 13.6906L10.3085 18.813L18.0201 11.0992L12.8962 5.97688ZM4.11851 20.9704L8.75906 19.8112L4.18692 15.239L3.02678 19.8796C2.95028 20.1856 3.04028 20.5105 3.26349 20.7337C3.48669 20.9569 3.8116 21.046 4.11851 20.9704Z" fill={color}></path>
</svg>
);
}
function ColorPicker(props: ColorPickerProps) { function ColorPicker(props: ColorPickerProps) {
const [color, setColor] = useState(props.value); const [color, setColor] = useState(props.value);
@ -73,12 +81,14 @@ export function SettingColorComponent({ label, name, themeSettings }: Props) {
return ( return (
<Forms.FormSection> <Forms.FormSection>
<Forms.FormTitle tag="h5">{label}</Forms.FormTitle> <div className={cl("swatch-row")}>
<ColorPicker <span>{label}</span>
key={name} <ColorPicker
value={normalizedValue} key={name}
onChange={handleChange} value={normalizedValue}
/> onChange={handleChange}
/>
</div>
</Forms.FormSection> </Forms.FormSection>
); );
} }

24
src/components/ThemeSettings/components/colorStyles.css
View file

@ -18,3 +18,27 @@
width: 14px; width: 14px;
height: 14px; height: 14px;
} }
.vc-usercss-settings-color-swatch-row {
display: flex;
flex-direction: row;
width: 100%;
align-items: center;
}
.vc-usercss-settings-color-swatch-row > span {
display: block;
flex: 1;
overflow: hidden;
margin-top: 0;
margin-bottom: 0;
color: var(--header-primary);
line-height: 24px;
font-size: 16px;
font-weight: 500;
word-wrap: break-word;
}
.vc-usercss-settings-color-swatch-row > .vc-usercss-settings-color-swatch {
flex: 0 0 auto;
}