cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-22 07:00:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict missed from before

Browse source
This commit is contained in:
bree 2021-07-04 21:11:23 -04:00
parent e070f26bda
commit e03449b75c
No known key found for this signature in database
GPG key ID: 1B2E56B9EC985B96
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/context/Theme.tsx
View file

@ -270,8 +270,8 @@ interface Props {
function Theme({ children, options }: Props) { function Theme({ children, options }: Props) {
const theme: Theme = { const theme: Theme = {
...PRESETS["dark"], ...PRESETS["dark"],
...PRESETS[props.options?.preset ?? ''], ...PRESETS[options?.preset ?? ''],
...props.options?.custom ...options?.custom
}; };
const root = document.documentElement.style; const root = document.documentElement.style;