summaryrefslogtreecommitdiff
path: root/packages/frontend/src/ui/deck
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/ui/deck
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/ui/deck')
-rw-r--r--packages/frontend/src/ui/deck/column.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/ui/deck/column.vue b/packages/frontend/src/ui/deck/column.vue
index bb931dda3f..09f748fcc6 100644
--- a/packages/frontend/src/ui/deck/column.vue
+++ b/packages/frontend/src/ui/deck/column.vue
@@ -48,13 +48,13 @@ import type { MenuItem } from '@/types/menu.js';
import { updateColumn, swapLeftColumn, swapRightColumn, swapUpColumn, swapDownColumn, stackLeftColumn, popRightColumn, removeColumn, swapColumn } from '@/deck.js';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
-import { miLocalStorage } from '@/local-storage.js';
+import { prefer } from '@/preferences.js';
provide('shouldHeaderThin', true);
provide('shouldOmitHeaderTitle', true);
provide('forceSpacerMin', true);
-const withWallpaper = miLocalStorage.getItem('wallpaper') != null;
+const withWallpaper = prefer.s['deck.wallpaper'] != null;
const props = withDefaults(defineProps<{
column: Column;