diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-11 22:36:59 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-11 22:36:59 +0900 |
| commit | 42c4ea38ccf09ba37ff552e37778ba1b702b781c (patch) | |
| tree | 39bffcf6c87fe7f0b31778b71993be2a72c0881d /src/client | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.86.0 (diff) | |
| download | misskey-42c4ea38ccf09ba37ff552e37778ba1b702b781c.tar.gz misskey-42c4ea38ccf09ba37ff552e37778ba1b702b781c.tar.bz2 misskey-42c4ea38ccf09ba37ff552e37778ba1b702b781c.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client')
29 files changed, 135 insertions, 89 deletions
diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue index 6a0c7f29f2..7a4cc5ef98 100644 --- a/src/client/components/date-separated-list.vue +++ b/src/client/components/date-separated-list.vue @@ -48,15 +48,7 @@ export default defineComponent({ render() { if (this.items.length === 0) return; - return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? { - class: 'sqadhkmv' + (this.noGap ? ' noGap _block' : ''), - name: 'list', - tag: 'div', - 'data-direction': this.direction, - 'data-reversed': this.reversed ? 'true' : 'false', - } : { - class: 'sqadhkmv' + (this.noGap ? ' noGap _block' : ''), - }, this.items.map((item, i) => { + const renderChildren = () => this.items.map((item, i) => { const el = this.$slots.default({ item: item })[0]; @@ -98,7 +90,19 @@ export default defineComponent({ return el; } } - })); + }); + + return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? { + class: 'sqadhkmv' + (this.noGap ? ' noGap _block' : ''), + name: 'list', + tag: 'div', + 'data-direction': this.direction, + 'data-reversed': this.reversed ? 'true' : 'false', + } : { + class: 'sqadhkmv' + (this.noGap ? ' noGap _block' : ''), + }, { + default: renderChildren + }); }, }); </script> diff --git a/src/client/components/form/form.scss b/src/client/components/form/form.scss index 05994ae650..00f40df9b1 100644 --- a/src/client/components/form/form.scss +++ b/src/client/components/form/form.scss @@ -32,8 +32,8 @@ margin: -8px calc(var(--formXPadding) * -1) 0 calc(var(--formXPadding) * -1); padding: 8px calc(var(--formContentHMargin) + var(--formXPadding)) 8px calc(var(--formContentHMargin) + var(--formXPadding)); background: var(--X17); - -webkit-backdrop-filter: blur(10px); - backdrop-filter: blur(10px); + -webkit-backdrop-filter: var(--blur, blur(10px)); + backdrop-filter: var(--blur, blur(10px)); } ._themeChanging_ ._formLabel { diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index 969f8563a4..f2c625a556 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -45,7 +45,7 @@ <button class="_button" @click="togglePoll" :class="{ active: poll }" v-tooltip="$ts.poll"><i class="fas fa-poll-h"></i></button> <button class="_button" @click="useCw = !useCw" :class="{ active: useCw }" v-tooltip="$ts.useCw"><i class="fas fa-eye-slash"></i></button> <button class="_button" @click="insertMention" v-tooltip="$ts.mention"><i class="fas fa-at"></i></button> - <button class="_button" @click="withHashtags = !withHashtags" v-tooltip="$ts.hashtags"><i class="fas fa-hashtag"></i></button> + <button class="_button" @click="withHashtags = !withHashtags" :class="{ active: withHashtags }" v-tooltip="$ts.hashtags"><i class="fas fa-hashtag"></i></button> <button class="_button" @click="insertEmoji" v-tooltip="$ts.emoji"><i class="fas fa-laugh-squint"></i></button> <button class="_button" @click="showActions" v-tooltip="$ts.plugin" v-if="postFormActions.length > 0"><i class="fas fa-plug"></i></button> </footer> @@ -615,7 +615,7 @@ export default defineComponent({ viaMobile: isMobile }; - if (this.withHashtags) { + if (this.withHashtags && this.hashtags && this.hashtags.trim() !== '') { const hashtags = this.hashtags.trim().split(' ').map(x => x.startsWith('#') ? x : '#' + x).join(' '); data.text = data.text ? `${data.text} ${hashtags}` : hashtags; } diff --git a/src/client/components/ui/button.vue b/src/client/components/ui/button.vue index 1e72660f33..d6ac42994f 100644 --- a/src/client/components/ui/button.vue +++ b/src/client/components/ui/button.vue @@ -177,17 +177,8 @@ export default defineComponent({ } &:focus { - &:after { - content: ""; - pointer-events: none; - position: absolute; - top: -5px; - right: -5px; - bottom: -5px; - left: -5px; - border: 2px solid var(--accentAlpha03); - border-radius: 10px; - } + outline: solid 2px var(--focus); + outline-offset: 2px; } &.inline + .bghgjjyj { diff --git a/src/client/components/ui/folder.vue b/src/client/components/ui/folder.vue index e6af40e36d..1f3593a74a 100644 --- a/src/client/components/ui/folder.vue +++ b/src/client/components/ui/folder.vue @@ -102,8 +102,8 @@ export default defineComponent({ background: var(--panel); /* TODO panelの半透明バージョンをプログラマティックに作りたい background: var(--X17); - -webkit-backdrop-filter: blur(8px); - backdrop-filter: blur(20px); + -webkit-backdrop-filter: var(--blur, blur(8px)); + backdrop-filter: var(--blur, blur(20px)); */ > .title { diff --git a/src/client/components/widgets.vue b/src/client/components/widgets.vue index 6e5c2d5ade..150d61c027 100644 --- a/src/client/components/widgets.vue +++ b/src/client/components/widgets.vue @@ -18,12 +18,12 @@ <div class="customize-container"> <button class="config _button" @click.prevent.stop="configWidget(element.id)"><i class="fas fa-cog"></i></button> <button class="remove _button" @click.prevent.stop="removeWidget(element)"><i class="fas fa-times"></i></button> - <component :is="`mkw-${element.name}`" :widget="element" :setting-callback="setting => settings[element.id] = setting" :column="column" @updateProps="updateWidget(element.id, $event)"/> + <component :is="`mkw-${element.name}`" :widget="element" :setting-callback="setting => settings[element.id] = setting" @updateProps="updateWidget(element.id, $event)"/> </div> </template> </XDraggable> </template> - <component v-else class="widget" v-for="widget in widgets" :is="`mkw-${widget.name}`" :key="widget.id" :widget="widget" :column="column" @updateProps="updateWidget(widget.id, $event)"/> + <component v-else class="widget" v-for="widget in widgets" :is="`mkw-${widget.name}`" :key="widget.id" :widget="widget" @updateProps="updateWidget(widget.id, $event)"/> </div> </template> diff --git a/src/client/init.ts b/src/client/init.ts index e6b308c5fb..a4a228da22 100644 --- a/src/client/init.ts +++ b/src/client/init.ts @@ -243,6 +243,14 @@ watch(defaultStore.reactiveState.useBlurEffectForModal, v => { document.documentElement.style.setProperty('--modalBgFilter', v ? 'blur(4px)' : 'none'); }, { immediate: true }); +watch(defaultStore.reactiveState.useBlurEffect, v => { + if (v) { + document.documentElement.style.removeProperty('--blur'); + } else { + document.documentElement.style.setProperty('--blur', 'none'); + } +}, { immediate: true }); + let reloadDialogShowing = false; stream.on('_disconnected_', async () => { if (defaultStore.state.serverDisconnectedBehavior === 'reload') { diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue index 1d57c80810..f7b9245fcc 100644 --- a/src/client/pages/about-misskey.vue +++ b/src/client/pages/about-misskey.vue @@ -68,40 +68,58 @@ import * as symbols from '@client/symbols'; const patrons = [ 'Satsuki Yanagi', 'noellabo', - 'Gargron', - 'Atsuko Tominaga', + 'mametsuko', 'AureoleArk', - 'naga_rus', - 'Melilot', - 'Hekovic', + 'Gargron', 'Nokotaro Takeda', - 'dansup', + 'Suji Yan', + 'Hekovic', + 'Gitmo Life Services', 'nenohi', - 'motcha', + 'naga_rus', + 'Melilot', + 'Efertone', + 'oi_yekssim', 'nanami kan', - 'Eduardo Quiros', - 'Peter G.', + 'motcha', + 'dansup', + 'Quinton Macejkovic', 'YUKIMOCHI', - 'Efertone', - 'makokunsan', 'mewl hayabusa', + 'makokunsan', + 'Peter G.', + 'Nesakko', + 'regtan', '見当かなみ', 'natalie', + 'Jerry', 'takimura', 'sikyosyounin', - 'weepjp', - 'mydarkstar', - 'Nesakko', + 'YuzuRyo61', 'sheeta.s', 'osapon', - 'YuzuRyo61', - 'wara', 'mkatze', - 'kiritan', 'CG', + 'nafuchoco', + 'Takumi Sugita', + 'chidori ninokura', + 'mydarkstar', + 'kiritan', + 'kabo2468y', + 'weepjp', + 'Liaizon Wakest', + 'Steffen K9', + 'Roujo', + 'uroco @99', + 'totokoro', + 'public_yusuke', + 'wara', + 'S Y', 'Denshi', 'Osushimaru', - 'Liaizon Wakest', + '吴浥', + 'DignifiedSilence', + 't_w', ]; export default defineComponent({ diff --git a/src/client/pages/channel.vue b/src/client/pages/channel.vue index 1504264af5..d725db9e49 100644 --- a/src/client/pages/channel.vue +++ b/src/client/pages/channel.vue @@ -152,8 +152,8 @@ export default defineComponent({ left: 0; width: 100%; height: 100%; - -webkit-backdrop-filter: blur(16px); - backdrop-filter: blur(16px); + -webkit-backdrop-filter: var(--blur, blur(16px)); + backdrop-filter: var(--blur, blur(16px)); background: rgba(0, 0, 0, 0.3); } diff --git a/src/client/pages/doc.vue b/src/client/pages/doc.vue index af3f56abcb..500d0340b7 100644 --- a/src/client/pages/doc.vue +++ b/src/client/pages/doc.vue @@ -5,6 +5,7 @@ <div class="body" v-html="body"></div> <div class="footer"> <MkLink :url="`https://github.com/misskey-dev/misskey/blob/master/src/docs/${lang}/${doc}.md`" class="at">{{ $ts.docSource }}</MkLink> + <p v-if="lang !== 'ja-JP'">{{ $ts.translateWarn }}</p> </div> </div> </div> diff --git a/src/client/pages/mfm-cheat-sheet.vue b/src/client/pages/mfm-cheat-sheet.vue index 751dccd7a1..95ddc1cbd1 100644 --- a/src/client/pages/mfm-cheat-sheet.vue +++ b/src/client/pages/mfm-cheat-sheet.vue @@ -333,8 +333,8 @@ export default defineComponent({ top: var(--stickyTop, 0px); padding: 16px; font-weight: bold; - -webkit-backdrop-filter: blur(10px); - backdrop-filter: blur(10px); + -webkit-backdrop-filter: var(--blur, blur(10px)); + backdrop-filter: var(--blur, blur(10px)); background-color: var(--X16); } diff --git a/src/client/pages/my-lists/index.vue b/src/client/pages/my-lists/index.vue index e92f11c7d0..7de31bb308 100644 --- a/src/client/pages/my-lists/index.vue +++ b/src/client/pages/my-lists/index.vue @@ -3,7 +3,10 @@ <MkButton @click="create" primary class="add"><i class="fas fa-plus"></i> {{ $ts.createList }}</MkButton> <MkPagination :pagination="pagination" #default="{items}" class="lists _content" ref="list"> - <MkA v-for="(list, i) in items" :key="list.id" class="list _panel" :to="`/my/lists/${ list.id }`">{{ list.name }}</MkA> + <MkA v-for="list in items" :key="list.id" class="list _panel" :to="`/my/lists/${ list.id }`"> + <div class="name">{{ list.name }}</div> + <MkAvatars :user-ids="list.userIds"/> + </MkA> </MkPagination> </div> </template> @@ -12,6 +15,7 @@ import { defineComponent } from 'vue'; import MkPagination from '@client/components/ui/pagination.vue'; import MkButton from '@client/components/ui/button.vue'; +import MkAvatars from '@client/components/avatars.vue'; import * as os from '@client/os'; import * as symbols from '@client/symbols'; @@ -19,6 +23,7 @@ export default defineComponent({ components: { MkPagination, MkButton, + MkAvatars, }, data() { @@ -63,7 +68,7 @@ export default defineComponent({ > .lists { > .list { - display: flex; + display: block; padding: 16px; border: solid 1px var(--divider); border-radius: 6px; @@ -72,6 +77,10 @@ export default defineComponent({ border: solid 1px var(--accent); text-decoration: none; } + + > .name { + margin-bottom: 4px; + } } } } diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue index cc40d2be98..cfa8107d28 100644 --- a/src/client/pages/settings/general.vue +++ b/src/client/pages/settings/general.vue @@ -33,6 +33,7 @@ <template #label>{{ $ts.appearance }}</template> <FormSwitch v-model:value="disableAnimatedMfm">{{ $ts.disableAnimatedMfm }}</FormSwitch> <FormSwitch v-model:value="reduceAnimation">{{ $ts.reduceUiAnimation }}</FormSwitch> + <FormSwitch v-model:value="useBlurEffect">{{ $ts.useBlurEffect }}</FormSwitch> <FormSwitch v-model:value="useBlurEffectForModal">{{ $ts.useBlurEffectForModal }}</FormSwitch> <FormSwitch v-model:value="showGapBetweenNotesInTimeline">{{ $ts.showGapBetweenNotesInTimeline }}</FormSwitch> <FormSwitch v-model:value="loadRawImages">{{ $ts.loadRawImages }}</FormSwitch> @@ -132,6 +133,7 @@ export default defineComponent({ serverDisconnectedBehavior: defaultStore.makeGetterSetter('serverDisconnectedBehavior'), reduceAnimation: defaultStore.makeGetterSetter('animation', v => !v, v => !v), useBlurEffectForModal: defaultStore.makeGetterSetter('useBlurEffectForModal'), + useBlurEffect: defaultStore.makeGetterSetter('useBlurEffect'), showGapBetweenNotesInTimeline: defaultStore.makeGetterSetter('showGapBetweenNotesInTimeline'), disableAnimatedMfm: defaultStore.makeGetterSetter('animatedMfm', v => !v, v => !v), useOsNativeEmojis: defaultStore.makeGetterSetter('useOsNativeEmojis'), diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue index 9cf424b127..4145c86d56 100644 --- a/src/client/pages/user/index.vue +++ b/src/client/pages/user/index.vue @@ -613,8 +613,8 @@ export default defineComponent({ position: absolute; top: 12px; right: 12px; - -webkit-backdrop-filter: blur(8px); - backdrop-filter: blur(8px); + -webkit-backdrop-filter: var(--blur, blur(8px)); + backdrop-filter: var(--blur, blur(8px)); background: rgba(0, 0, 0, 0.2); padding: 8px; border-radius: 24px; diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue index 299271c347..7d49ddd7d7 100644 --- a/src/client/pages/welcome.entrance.a.vue +++ b/src/client/pages/welcome.entrance.a.vue @@ -260,6 +260,7 @@ export default defineComponent({ display: block; margin: 0; padding: 32px 32px 24px 32px; + font-size: 1.5em; > .logo { vertical-align: bottom; diff --git a/src/client/scripts/paging.ts b/src/client/scripts/paging.ts index 194c2e8003..1da518efa1 100644 --- a/src/client/scripts/paging.ts +++ b/src/client/scripts/paging.ts @@ -201,7 +201,11 @@ export default (opts) => ({ if (isBottom) { // オーバーフローしたら古いアイテムは捨てる if (this.items.length >= opts.displayLimit) { - this.items = this.items.slice(-opts.displayLimit); + // このやり方だとVue 3.2以降アニメーションが動かなくなる + //this.items = this.items.slice(-opts.displayLimit); + while (this.items.length >= opts.displayLimit) { + this.items.shift(); + } this.more = true; } } @@ -216,7 +220,11 @@ export default (opts) => ({ // オーバーフローしたら古いアイテムは捨てる if (this.items.length >= opts.displayLimit) { - this.items = this.items.slice(0, opts.displayLimit); + // このやり方だとVue 3.2以降アニメーションが動かなくなる + //this.items = this.items.slice(0, opts.displayLimit); + while (this.items.length >= opts.displayLimit) { + this.items.pop(); + } this.more = true; } } else { diff --git a/src/client/store.ts b/src/client/store.ts index 364d8afd93..4c4a7d93e9 100644 --- a/src/client/store.ts +++ b/src/client/store.ts @@ -142,6 +142,10 @@ export const defaultStore = markRaw(new Storage('base', { where: 'device', default: true }, + useBlurEffect: { + where: 'device', + default: false + }, showFixedPostForm: { where: 'device', default: false diff --git a/src/client/style.scss b/src/client/style.scss index 1253141d36..a3e3b6a6a1 100644 --- a/src/client/style.scss +++ b/src/client/style.scss @@ -404,8 +404,8 @@ hr { ._acrylic { background: var(--acrylicPanel); - -webkit-backdrop-filter: blur(15px); - backdrop-filter: blur(15px); + -webkit-backdrop-filter: var(--blur, blur(15px)); + backdrop-filter: var(--blur, blur(15px)); } ._inputSplit { diff --git a/src/client/ui/_common_/sidebar.vue b/src/client/ui/_common_/sidebar.vue index ffa3a67b13..b7b88faeac 100644 --- a/src/client/ui/_common_/sidebar.vue +++ b/src/client/ui/_common_/sidebar.vue @@ -374,8 +374,8 @@ export default defineComponent({ padding-top: 8px; padding-bottom: 8px; background: var(--X14); - -webkit-backdrop-filter: blur(8px); - backdrop-filter: blur(8px); + -webkit-backdrop-filter: var(--blur, blur(8px)); + backdrop-filter: var(--blur, blur(8px)); } &:first-child { diff --git a/src/client/ui/chat/index.vue b/src/client/ui/chat/index.vue index db663c4530..e8275def81 100644 --- a/src/client/ui/chat/index.vue +++ b/src/client/ui/chat/index.vue @@ -55,7 +55,7 @@ <MkA to="/my/favorites" class="item"><i class="fas fa-star icon"></i>{{ $ts.favorites }}</MkA> </div> </div> - <MkAd class="a" prefer="square"/> + <MkAd class="a" :prefer="['square']"/> </div> <footer class="footer"> <div class="left"> @@ -373,8 +373,8 @@ export default defineComponent({ position: sticky; top: 0; background: var(--X17); - -webkit-backdrop-filter: blur(8px); - backdrop-filter: blur(8px); + -webkit-backdrop-filter: var(--blur, blur(8px)); + backdrop-filter: var(--blur, blur(8px)); z-index: 1; color: var(--fgTransparentWeak); diff --git a/src/client/ui/chat/side.vue b/src/client/ui/chat/side.vue index 5ccfad1b75..ebf1cf9979 100644 --- a/src/client/ui/chat/side.vue +++ b/src/client/ui/chat/side.vue @@ -130,8 +130,8 @@ export default defineComponent({ width: 100%; font-weight: bold; //background-color: var(--panel); - -webkit-backdrop-filter: blur(32px); - backdrop-filter: blur(32px); + -webkit-backdrop-filter: var(--blur, blur(32px)); + backdrop-filter: var(--blur, blur(32px)); background-color: var(--header); border-bottom: solid 0.5px var(--divider); box-sizing: border-box; diff --git a/src/client/ui/deck/column.vue b/src/client/ui/deck/column.vue index eaf9280698..842a6ff59f 100644 --- a/src/client/ui/deck/column.vue +++ b/src/client/ui/deck/column.vue @@ -305,8 +305,8 @@ export default defineComponent({ &.naked { background: var(--acrylicBg) !important; - -webkit-backdrop-filter: blur(10px); - backdrop-filter: blur(10px); + -webkit-backdrop-filter: var(--blur, blur(10px)); + backdrop-filter: var(--blur, blur(10px)); > header { background: transparent; diff --git a/src/client/ui/default.side.vue b/src/client/ui/default.side.vue index dca16cdb3e..4d65779612 100644 --- a/src/client/ui/default.side.vue +++ b/src/client/ui/default.side.vue @@ -138,8 +138,8 @@ export default defineComponent({ text-align: center; font-weight: bold; //background-color: var(--panel); - -webkit-backdrop-filter: blur(32px); - backdrop-filter: blur(32px); + -webkit-backdrop-filter: var(--blur, blur(32px)); + backdrop-filter: var(--blur, blur(32px)); background-color: var(--header); > ._button { diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue index 3fc666c833..23b63114cc 100644 --- a/src/client/ui/default.vue +++ b/src/client/ui/default.vue @@ -240,7 +240,7 @@ export default defineComponent({ &.wallpaper { background: var(--wallpaperOverlay); - //backdrop-filter: blur(4px); + //backdrop-filter: var(--blur, blur(4px)); } &.isMobile { @@ -303,8 +303,8 @@ export default defineComponent({ z-index: 1000; top: var(--globalHeaderHeight, 0px); height: $header-height; - -webkit-backdrop-filter: blur(32px); - backdrop-filter: blur(32px); + -webkit-backdrop-filter: var(--blur, blur(32px)); + backdrop-filter: var(--blur, blur(32px)); background-color: var(--header); border-bottom: solid 0.5px var(--divider); } @@ -380,8 +380,8 @@ export default defineComponent({ display: flex; width: 100%; box-sizing: border-box; - -webkit-backdrop-filter: blur(32px); - backdrop-filter: blur(32px); + -webkit-backdrop-filter: var(--blur, blur(32px)); + backdrop-filter: var(--blur, blur(32px)); background-color: var(--header); border-top: solid 0.5px var(--divider); diff --git a/src/client/ui/default.widgets.vue b/src/client/ui/default.widgets.vue index 0bacc83d52..f9584402a2 100644 --- a/src/client/ui/default.widgets.vue +++ b/src/client/ui/default.widgets.vue @@ -1,7 +1,7 @@ <template> <div class="ddiqwdnk"> <XWidgets class="widgets" :edit="editMode" :widgets="$store.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/> - <MkAd class="a" prefer="square"/> + <MkAd class="a" :prefer="['square']"/> <button v-if="editMode" @click="editMode = false" class="_textButton edit" style="font-size: 0.9em;"><i class="fas fa-check"></i> {{ $ts.editWidgetsExit }}</button> <button v-else @click="editMode = true" class="_textButton edit" style="font-size: 0.9em;"><i class="fas fa-pencil-alt"></i> {{ $ts.editWidgets }}</button> diff --git a/src/client/ui/universal.vue b/src/client/ui/universal.vue index 1e8c4b36d5..c49ad730f4 100644 --- a/src/client/ui/universal.vue +++ b/src/client/ui/universal.vue @@ -250,7 +250,7 @@ export default defineComponent({ &.wallpaper { background: var(--wallpaperOverlay); - //backdrop-filter: blur(4px); + //backdrop-filter: var(--blur, blur(4px)); } > .contents { @@ -269,8 +269,8 @@ export default defineComponent({ text-align: center; font-weight: bold; //background-color: var(--panel); - -webkit-backdrop-filter: blur(32px); - backdrop-filter: blur(32px); + -webkit-backdrop-filter: var(--blur, blur(32px)); + backdrop-filter: var(--blur, blur(32px)); background-color: var(--header); //border-bottom: solid 0.5px var(--divider); user-select: none; @@ -341,8 +341,8 @@ export default defineComponent({ display: flex; width: 100%; box-sizing: border-box; - -webkit-backdrop-filter: blur(32px); - backdrop-filter: blur(32px); + -webkit-backdrop-filter: var(--blur, blur(32px)); + backdrop-filter: var(--blur, blur(32px)); background-color: var(--header); &:not(.navHidden) { diff --git a/src/client/ui/visitor/header.vue b/src/client/ui/visitor/header.vue index 1effadf4f7..6d2ebc880f 100644 --- a/src/client/ui/visitor/header.vue +++ b/src/client/ui/visitor/header.vue @@ -90,8 +90,8 @@ export default defineComponent({ left: 0; z-index: 1000; line-height: $height; - -webkit-backdrop-filter: blur(32px); - backdrop-filter: blur(32px); + -webkit-backdrop-filter: var(--blur, blur(32px)); + backdrop-filter: var(--blur, blur(32px)); background-color: var(--X16); > .wide { diff --git a/src/client/ui/visitor/kanban.vue b/src/client/ui/visitor/kanban.vue index ffa7a3d1ff..5fbbff3d32 100644 --- a/src/client/ui/visitor/kanban.vue +++ b/src/client/ui/visitor/kanban.vue @@ -122,8 +122,8 @@ export default defineComponent({ background: rgba(0, 0, 0, 0.3); &.transparent { - -webkit-backdrop-filter: blur(12px); - backdrop-filter: blur(12px); + -webkit-backdrop-filter: var(--blur, blur(12px)); + backdrop-filter: var(--blur, blur(12px)); } } @@ -140,8 +140,8 @@ export default defineComponent({ margin: 0 auto; > .panel { - -webkit-backdrop-filter: blur(8px); - backdrop-filter: blur(8px); + -webkit-backdrop-filter: var(--blur, blur(8px)); + backdrop-filter: var(--blur, blur(8px)); background: rgba(0, 0, 0, 0.5); border-radius: var(--radius); diff --git a/src/client/ui/zen.vue b/src/client/ui/zen.vue index 6e7382b0d3..3756ddb5c3 100644 --- a/src/client/ui/zen.vue +++ b/src/client/ui/zen.vue @@ -89,8 +89,8 @@ export default defineComponent({ line-height: $header-height; text-align: center; //background-color: var(--panel); - -webkit-backdrop-filter: blur(32px); - backdrop-filter: blur(32px); + -webkit-backdrop-filter: var(--blur, blur(32px)); + backdrop-filter: var(--blur, blur(32px)); background-color: var(--header); border-bottom: solid 0.5px var(--divider); } |