diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-11-28 13:05:57 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-11-28 13:05:57 +0900 |
| commit | 10fb02960997342aedefaed8111f5c7129339258 (patch) | |
| tree | 9b93ba5a86109b03f84ebca821b7ede00bb89b39 /src | |
| parent | Update about page (diff) | |
| download | misskey-10fb02960997342aedefaed8111f5c7129339258.tar.gz misskey-10fb02960997342aedefaed8111f5c7129339258.tar.bz2 misskey-10fb02960997342aedefaed8111f5c7129339258.zip | |
Resolve #6858
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/pages/settings/general.vue | 15 | ||||
| -rw-r--r-- | src/client/style.scss | 6 | ||||
| -rw-r--r-- | src/server/web/views/base.pug | 5 |
3 files changed, 23 insertions, 3 deletions
diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue index 7c2905fdeb..d7acc9ad4f 100644 --- a/src/client/pages/settings/general.vue +++ b/src/client/pages/settings/general.vue @@ -33,11 +33,12 @@ <FormSwitch v-model:value="disableAnimatedMfm">{{ $t('disableAnimatedMfm') }}</FormSwitch> <FormSwitch v-model:value="reduceAnimation">{{ $t('reduceUiAnimation') }}</FormSwitch> <FormSwitch v-model:value="useBlurEffectForModal">{{ $t('useBlurEffectForModal') }}</FormSwitch> + <FormSwitch v-model:value="loadRawImages">{{ $t('loadRawImages') }}</FormSwitch> + <FormSwitch v-model:value="disableShowingAnimatedImages">{{ $t('disableShowingAnimatedImages') }}</FormSwitch> + <FormSwitch v-model:value="useSystemFont">{{ $t('useSystemFont') }}</FormSwitch> <FormSwitch v-model:value="useOsNativeEmojis">{{ $t('useOsNativeEmojis') }} <div><Mfm text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></div> </FormSwitch> - <FormSwitch v-model:value="loadRawImages">{{ $t('loadRawImages') }}</FormSwitch> - <FormSwitch v-model:value="disableShowingAnimatedImages">{{ $t('disableShowingAnimatedImages') }}</FormSwitch> </FormGroup> <FormRadios v-model="fontSize"> @@ -118,6 +119,7 @@ export default defineComponent({ langs, lang: localStorage.getItem('lang'), fontSize: localStorage.getItem('fontSize'), + useSystemFont: localStorage.getItem('useSystemFont') != null, faImage, faCog, faColumns } }, @@ -221,6 +223,15 @@ export default defineComponent({ location.reload(); }, + useSystemFont() { + if (this.useSystemFont) { + localStorage.setItem('useSystemFont', 't'); + } else { + localStorage.removeItem('useSystemFont'); + } + location.reload(); + }, + enableInfiniteScroll() { location.reload() }, diff --git a/src/client/style.scss b/src/client/style.scss index f42805edd8..e2d3e596ae 100644 --- a/src/client/style.scss +++ b/src/client/style.scss @@ -27,7 +27,7 @@ html { color: var(--fg); overflow: auto; font-family: "BIZ UDPGothic", Roboto, HelveticaNeue, Arial, sans-serif; - line-height: 1.3em; + line-height: 1.35em; text-size-adjust: 100%; &, * { @@ -75,6 +75,10 @@ html { &.f-veryLarge { font-size: 1.2em; } + + &.useSystemFont { + font-family: sans-serif; + } } html.changing-theme { diff --git a/src/server/web/views/base.pug b/src/server/web/views/base.pug index 9652d29dbb..cbba6bd08a 100644 --- a/src/server/web/views/base.pug +++ b/src/server/web/views/base.pug @@ -94,6 +94,11 @@ html document.documentElement.classList.add('f-' + fontSize); } + const useSystemFont = localStorage.getItem('useSystemFont'); + if (useSystemFont) { + document.documentElement.classList.add('useSystemFont'); + } + const wallpaper = localStorage.getItem('wallpaper'); if (wallpaper) { document.documentElement.style.backgroundImage = `url(${wallpaper})`; |