This commit is contained in:
pa
2026-01-18 18:52:31 +09:00
committed by Natsumi
parent 1de16dc699
commit 9081dbe2b1
19 changed files with 113 additions and 454 deletions

View File

@@ -1,7 +1,8 @@
<template>
<div class="gallery-page x-container">
<div class="gallery-page__header">
<Button variant="ghost" class="gallery-page__back" @click="goBack">
<div class="flex items-center gap-2 ml-2">
<Button variant="ghost" size="sm" class="mr-3" @click="goBack">
<ArrowLeft />
{{ t('nav_tooltip.tools') }}
</Button>
<span class="header">{{ t('dialog.gallery_icons.header') }}</span>
@@ -441,7 +442,7 @@
<InputGroupTextareaField
v-model="printUploadNote"
:rows="1"
maxlength="32"
:maxlength="32"
style="margin-left: 10px; width: 300px"
:placeholder="t('dialog.gallery_icons.note')"
input-class="resize-none min-h-0" />
@@ -459,7 +460,10 @@
<div
class="h-[200px] w-[200px] rounded-[20px] overflow-hidden cursor-pointer"
@click="showFullscreenImageDialog(image.files.image, getPrintFileName(image))">
<img class="h-full w-full rounded-[15px] object-cover" :src="image.files.image" loading="lazy" />
<img
class="h-full w-full rounded-[15px] object-cover"
:src="image.files.image"
loading="lazy" />
</div>
<div style="margin-top: 5px; width: 208px">
<span class="block truncate" v-if="image.note" v-text="image.note"></span>
@@ -468,8 +472,7 @@
class="block truncate"
v-if="image.worldId"
:location="image.worldId"
:hint="image.worldName"
/>
:hint="image.worldName" />
<span v-else class="block">&nbsp;</span>
<DisplayName
class="block truncate gallery-meta"
@@ -525,15 +528,14 @@
:key="item.id"
style="display: inline-block; margin-top: 10px; width: unset; cursor: default">
<div class="h-[200px] w-[200px] rounded-[20px] overflow-hidden cursor-default">
<img class="h-full w-full rounded-[15px] object-cover" :src="item.imageUrl" loading="lazy" />
<img
class="h-full w-full rounded-[15px] object-cover"
:src="item.imageUrl"
loading="lazy" />
</div>
<div style="margin-top: 5px; width: 208px">
<span class="block truncate" v-text="item.name"></span>
<span
v-if="item.description"
class="block truncate"
v-text="item.description"
></span>
<span v-if="item.description" class="block truncate" v-text="item.description"></span>
<span v-else class="block">&nbsp;</span>
<span class="block truncate gallery-meta gallery-meta--small">
{{ formatDateFilter(item.created_at, 'long') }}
@@ -561,7 +563,7 @@
</template>
<script setup>
import { Gift, Maximize2, RefreshCw, Trash2, Upload, X } from 'lucide-vue-next';
import { ArrowLeft, Gift, Maximize2, RefreshCw, Trash2, Upload, X } from 'lucide-vue-next';
import {
NumberField,
NumberFieldContent,
@@ -603,12 +605,6 @@
const {
galleryTable,
galleryDialogVisible,
galleryDialogGalleryLoading,
galleryDialogIconsLoading,
galleryDialogEmojisLoading,
galleryDialogStickersLoading,
galleryDialogPrintsLoading,
galleryDialogInventoryLoading,
VRCPlusIconsTable,
printUploadNote,
printCropBorder,
@@ -1183,13 +1179,6 @@
</script>
<style scoped>
.gallery-page__header {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 12px;
}
.gallery-tab-count {
font-size: 12px;
margin-left: 5px;

View File

@@ -1,7 +1,8 @@
<template>
<div class="screenshot-metadata-page x-container">
<div class="screenshot-metadata-page__header">
<Button variant="ghost" class="screenshot-metadata-page__back" @click="goBack">
<div class="flex items-center gap-2 ml-2">
<Button variant="ghost" size="sm" class="mr-3" @click="goBack">
<ArrowLeft />
{{ t('nav_tooltip.tools') }}
</Button>
<span class="header">{{ t('dialog.screenshot_metadata.header') }}</span>
@@ -151,6 +152,7 @@
import { Carousel, CarouselContent, CarouselItem, CarouselNext, CarouselPrevious } from '@/components/ui/carousel';
import { onBeforeUnmount, onMounted, reactive, ref } from 'vue';
import { useGalleryStore, useUserStore, useVrcxStore } from '@/stores';
import { ArrowLeft } from 'lucide-vue-next';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { InputGroupSearch } from '@/components/ui/input-group';
@@ -533,12 +535,3 @@
}
}
</script>
<style scoped>
.screenshot-metadata-page__header {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 12px;
}
</style>

View File

@@ -19,7 +19,7 @@
<PopoverContent
side="right"
align="start"
class="w-[500px] p-3"
class="w-125 p-3"
@mouseenter="openEventPopover"
@mouseleave="scheduleCloseEventPopover">
<div class="flex items-baseline justify-between gap-3 text-xs">
@@ -312,6 +312,7 @@
gap: 4px;
border-radius: 50%;
cursor: pointer;
background-color: var(--color-accent);
}
.event-card .badges .share-badge {
@@ -324,6 +325,7 @@
border-radius: 50%;
cursor: pointer;
margin-right: 5px;
background-color: var(--color-accent);
}
.event-card .event-content {
@@ -366,9 +368,6 @@
margin-bottom: 2px;
}
.event-card .event-title-content:hover {
}
.event-card .event-info {
display: flex;
justify-content: space-between;

View File

@@ -139,7 +139,7 @@
{{ dayLabel(weekDate) }}
<div
v-if="eventCountFor(weekDate) > 0"
class="calendar-event-badge"
class="calendar-event-badge text-zinc-900"
:class="hasFollowingFor(weekDate) ? 'has-following' : 'no-following'">
{{ eventCountFor(weekDate) }}
</div>
@@ -165,6 +165,7 @@
width: 100%;
display: flex;
align-items: flex-start;
padding: 0 12x 0 12px;
}
.date {
@@ -186,9 +187,6 @@
position: relative;
}
.calendar-date-content.has-events {
}
.calendar-event-badge {
position: absolute;
top: -4px;
@@ -203,12 +201,7 @@
z-index: 10;
padding: 0 5px;
line-height: 14px;
}
.calendar-event-badge.has-following {
}
.calendar-event-badge.no-following {
background-color: var(--color-accent);
}
.calendar-event-dot {

View File

@@ -1,9 +1,13 @@
<template>
<Dialog :open="visible" @update:open="(open) => (open ? null : closeDialog())">
<DialogContent class="x-dialog sm:max-w-[50vw] h-[60vh] overflow-hidden">
<DialogContent class="x-dialog sm:max-w-[50vw] h-[70vh] overflow-hidden">
<DialogHeader>
<div class="dialog-title-container">
<DialogTitle>{{ t('dialog.group_calendar.header') }}</DialogTitle>
</div>
<div class="featured-switch">
<span class="featured-switch-text">{{ t('dialog.group_calendar.featured_events') }}</span>
<Switch v-model="showFeaturedEvents" @update:modelValue="toggleFeaturedEvents" class="mr-2" />
<Button size="sm" variant="outline" @click="toggleViewMode" class="view-toggle-btn">
{{
viewMode === 'timeline'
@@ -12,10 +16,6 @@
}}
</Button>
</div>
<div class="featured-switch">
<span class="featured-switch-text">{{ t('dialog.group_calendar.featured_events') }}</span>
<Switch v-model="showFeaturedEvents" @update:modelValue="toggleFeaturedEvents" />
</div>
</DialogHeader>
<div class="top-content">
<div v-if="viewMode === 'timeline'" key="timeline" class="timeline-view">
@@ -458,6 +458,7 @@
margin-left: 10px;
margin-right: 6px;
overflow: auto;
height: 50vh;
.timeline-list {
display: flex;
@@ -506,9 +507,7 @@
position: relative;
&.has-events {
background-color: var(
--group-calendar-event-bg,
);
background-color: var(--group-calendar-event-bg,);
}
.calendar-event-badge {
position: absolute;
@@ -525,10 +524,6 @@
z-index: 10;
padding: 0 4px;
line-height: 16px;
&.has-following {
}
&.no-following {
}
}
}
}
@@ -551,6 +546,7 @@
.featured-switch {
display: flex;
justify-content: flex-end;
align-items: center;
margin-top: 10px;
.featured-switch-text {
font-size: 13px;
@@ -559,24 +555,10 @@
}
.timeline-view {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
display: flex;
align-items: center;
.timeline-container {
flex: 1;
width: 100%;
height: 100%;
display: flex;
justify-content: center;
}
.calendar-container {
width: 609px;
height: 100%;
flex-shrink: 0;
}
}