kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

Merge branch 'misskey-develop' into merge/2025-03-24

Browse Source
This commit is contained in:
Hazelnoot
2025-03-31 16:07:41 -04:00
parent e7632c83dc 5aca91251a
commit 2983092c06
59 changed files with 633 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/src/ui/deck/column.vue
+43 -7
View File
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div
:class="[$style.root, { [$style.paged]: isMainColumn, [$style.naked]: naked, [$style.active]: active, [$style.draghover]: draghover, [$style.dragging]: dragging, [$style.dropready]: dropready }]"
:class="[$style.root, { [$style.paged]: isMainColumn, [$style.naked]: naked, [$style.active]: active, [$style.draghover]: draghover, [$style.dragging]: dragging, [$style.dropready]: dropready, [$style.withWallpaper]: withWallpaper }]"
@dragover.prevent.stop="onDragover"
@dragleave="onDragleave"
@drop.prevent.stop="onDrop"
@@ -48,11 +48,14 @@ 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';
provide('shouldHeaderThin', true);
provide('shouldOmitHeaderTitle', true);
provide('forceSpacerMin', true);
const withWallpaper = miLocalStorage.getItem('wallpaper') != null;
const props = withDefaults(defineProps<{
column: Column;
isStacked?: boolean;
@@ -108,9 +111,7 @@ function getMenu() {
const menuItems: MenuItem[] = [];
if (props.menu) {
menuItems.push(...props.menu, {
type: 'divider',
});
menuItems.push(...props.menu);
}
if (props.refresher) {
@@ -125,6 +126,12 @@ function getMenu() {
});
}
if (menuItems.length > 0) {
menuItems.push({
type: 'divider',
});
}
menuItems.push({
icon: 'ti ti-settings',
text: i18n.ts._deck.configureColumn,
@@ -153,6 +160,21 @@ function getMenu() {
},
});
const flexibleRef = ref(props.column.flexible ?? false);
watch(flexibleRef, flexible => {
updateColumn(props.column.id, {
flexible,
});
});
menuItems.push({
type: 'switch',
icon: 'ti ti-arrows-horizontal',
text: i18n.ts._deck.flexible,
ref: flexibleRef,
});
const moveToMenuItems: MenuItem[] = [];
moveToMenuItems.push({
@@ -333,9 +355,7 @@ function onDrop(ev) {
}
&.naked {
background: var(--MI_THEME-acrylicBg) !important;
-webkit-backdrop-filter: var(--MI-blur, blur(10px));
backdrop-filter: var(--MI-blur, blur(10px));
background: color(from var(--MI_THEME-bg) srgb r g b / 0.5) !important;
> .header {
background: transparent;
@@ -353,6 +373,22 @@ function onDrop(ev) {
}
}
&.withWallpaper {
&.naked {
background: color(from var(--MI_THEME-bg) srgb r g b / 0.75) !important;
-webkit-backdrop-filter: var(--MI-blur, blur(10px));
backdrop-filter: var(--MI-blur, blur(10px));
> .header {
color: light-dark(#000000bf, #ffffffbf);
}
}
.tabShape {
display: none;
}
}
&.paged {
background: var(--MI_THEME-bg) !important;