summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components/global
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-04-01 09:58:59 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-04-01 09:59:46 -0400
commit7ff15816d1cc23ca89c89de0f9be84cbb3cf6abb (patch)
tree4c03b36b9bfe78469bf94017edeebe2357378eaf /packages/frontend/src/components/global
parentMerge branch 'misskey-develop' into merge/2025-03-24 (diff)
parentBump version to 2025.4.0-beta.0 (diff)
downloadsharkey-7ff15816d1cc23ca89c89de0f9be84cbb3cf6abb.tar.gz
sharkey-7ff15816d1cc23ca89c89de0f9be84cbb3cf6abb.tar.bz2
sharkey-7ff15816d1cc23ca89c89de0f9be84cbb3cf6abb.zip
Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts: # .github/workflows/api-misskey-js.yml # .github/workflows/changelog-check.yml # .github/workflows/check-misskey-js-autogen.yml # .github/workflows/get-api-diff.yml # .github/workflows/lint.yml # .github/workflows/locale.yml # .github/workflows/on-release-created.yml # .github/workflows/storybook.yml # .github/workflows/test-backend.yml # .github/workflows/test-federation.yml # .github/workflows/test-frontend.yml # .github/workflows/test-misskey-js.yml # .github/workflows/test-production.yml # .github/workflows/validate-api-json.yml # locales/index.d.ts # package.json # packages/misskey-js/generator/package.json # packages/misskey-js/package.json # pnpm-lock.yaml # scripts/changelog-checker/package-lock.json # scripts/changelog-checker/package.json
Diffstat (limited to 'packages/frontend/src/components/global')
-rw-r--r--packages/frontend/src/components/global/PageWithAnimBg.vue10
1 files changed, 9 insertions, 1 deletions
diff --git a/packages/frontend/src/components/global/PageWithAnimBg.vue b/packages/frontend/src/components/global/PageWithAnimBg.vue
index a00b196a04..7106ae20cd 100644
--- a/packages/frontend/src/components/global/PageWithAnimBg.vue
+++ b/packages/frontend/src/components/global/PageWithAnimBg.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div>
<MkAnimBg style="position: absolute;"/>
- <div class="_pageScrollable" style="position: absolute; top: 0; width: 100%; height: 100%;">
+ <div class="_pageScrollable" :class="$style.body">
<slot></slot>
</div>
</div>
@@ -17,5 +17,13 @@ import MkAnimBg from '@/components/MkAnimBg.vue';
</script>
<style lang="scss" module>
+.body {
+ position: absolute;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ // _pageScrollable はパフォーマンス上の理由で背景色が設定されているため
+ background: transparent !important;
+}
</style>