abner/for-legacy-web
1
0
Fork 1
mirror of https://github.com/stoatchat/for-legacy-web.git synced 2026-03-09 18:15:28 +00:00
Code Issues Packages Projects Releases 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 1cc6514c9a
commit f7466773ad
1 changed files with 2 additions and 2 deletions
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;