diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-04-03 14:01:19 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-04-03 14:01:19 +0900 |
| commit | 090f8eff670b841499348fc0ccfb0e7b42928e2a (patch) | |
| tree | cad9b694ac0ca85e99b48f8d930e72e041f08d12 /packages/client | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.109.2 (diff) | |
| download | misskey-090f8eff670b841499348fc0ccfb0e7b42928e2a.tar.gz misskey-090f8eff670b841499348fc0ccfb0e7b42928e2a.tar.bz2 misskey-090f8eff670b841499348fc0ccfb0e7b42928e2a.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/client')
| -rw-r--r-- | packages/client/package.json | 2 | ||||
| -rw-r--r-- | packages/client/src/scripts/theme.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/client/package.json b/packages/client/package.json index c6b0363adb..d44df92d7b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -3,7 +3,7 @@ "scripts": { "watch": "webpack --watch", "build": "webpack", - "lint": "eslint --quiet src/**/*.{ts,vue}" + "lint": "eslint --quiet 'src/**/*.{ts,vue}'" }, "resolutions": { "chokidar": "^3.3.1", diff --git a/packages/client/src/scripts/theme.ts b/packages/client/src/scripts/theme.ts index 45743d0ffa..2cb78fae5c 100644 --- a/packages/client/src/scripts/theme.ts +++ b/packages/client/src/scripts/theme.ts @@ -51,14 +51,14 @@ export function applyTheme(theme: Theme, persist = true) { if (_theme.base) { const base = [lightTheme, darkTheme].find(x => x.id === _theme.base); - _theme.props = Object.assign({}, base.props, _theme.props); + if (base) _theme.props = Object.assign({}, base.props, _theme.props); } const props = compile(_theme); for (const tag of document.head.children) { if (tag.tagName === 'META' && tag.getAttribute('name') === 'theme-color') { - tag.setAttribute('content', props['html']); + tag.setAttribute('content', props['htmlThemeColor']); break; } } |