Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(ui): align SaaS select and action menu themes

Timothy Yine2a29e4dfc22
diff --git a/apps/cloud/app/components/CloudProcessingSettings.vue b/apps/cloud/app/components/CloudProcessingSettings.vue
index 0090343b..8c99e0e8 100644
--- a/apps/cloud/app/components/CloudProcessingSettings.vue
+++ b/apps/cloud/app/components/CloudProcessingSettings.vue
@@ -61,14 +61,6 @@ async function save() {
)
}}</span></label
>
- <p class="cf-field-hint">
- {{
- t(
- 'Use the photo library processing actions to erase locations on existing photos. Live Photo companion videos are retained as uploaded, as in the self-hosted edition.',
- '已有照片可在照片库的处理操作中擦除位置。与自部署版一致,实况照片的配对视频保持上传内容。',
- )
- }}
- </p>
<p
v-if="error"
role="alert"
diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.json
index 27fe38f1..de73ee98 100644
--- a/apps/cloud/i18n/locales/en.json
+++ b/apps/cloud/i18n/locales/en.json
@@ -806,7 +806,7 @@
},
"dashboard": {
"mostPopular": "Most popular",
- "popularRange": "Past 7 days · Page views",
+ "popularRange": "Past 7 days Page views",
"popularError": "Unable to load popular photos.",
"popularEmpty": "No photo views in the past 7 days.",
"workspaceOverview": "Workspace overview",
diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.json
index 9c1d9538..e43b5714 100644
--- a/apps/cloud/i18n/locales/zh-Hans.json
+++ b/apps/cloud/i18n/locales/zh-Hans.json
@@ -806,7 +806,7 @@
},
"dashboard": {
"mostPopular": "最受欢迎",
- "popularRange": "近 7 天 · 访问量",
+ "popularRange": "近 7 天 访问量",
"popularError": "暂时无法加载访问排名。",
"popularEmpty": "近 7 天暂无照片访问记录。",
"workspaceOverview": "工作区概览",
diff --git a/packages/saas-ui/app/app.config.ts b/packages/saas-ui/app/app.config.ts
index 4985fccf..6b6fb77d 100644
--- a/packages/saas-ui/app/app.config.ts
+++ b/packages/saas-ui/app/app.config.ts
@@ -1,3 +1,11 @@
+// Select and searchable SelectMenu share the upload drawer's neutral surface.
+// Explicit radii avoid Nuxt UI scaling --ui-radius into oversized menu corners.
+const selectSlots = {
+ base: 'min-h-[var(--cf-control-height)] rounded-[6px]',
+ content: 'bg-default text-default ring ring-default rounded-[6px] shadow-lg',
+ item: 'before:rounded-[4px] data-highlighted:not-data-disabled:before:bg-muted',
+}
+
export default defineAppConfig({
ui: {
colors: {
@@ -9,6 +17,23 @@ export default defineAppConfig({
warning: 'amber',
error: 'red',
},
+ select: { slots: selectSlots },
+ selectMenu: { slots: selectSlots },
+ dropdownMenu: {
+ slots: {
+ content:
+ 'bg-default text-default ring ring-default rounded-[6px] shadow-lg',
+ item: 'before:rounded-[4px]',
+ },
+ variants: {
+ active: {
+ true: { item: 'text-highlighted before:bg-muted' },
+ false: {
+ item: 'text-default data-highlighted:text-highlighted data-[state=open]:text-highlighted data-highlighted:before:bg-muted data-[state=open]:before:bg-muted',
+ },
+ },
+ },
+ },
button: { slots: { base: 'cursor-pointer rounded-md font-medium' } },
modal: {
variants: { overlay: { true: { overlay: 'bg-black/55' } } },
diff --git a/packages/saas-ui/app/components/CfSelect.vue b/packages/saas-ui/app/components/CfSelect.vue
index af90c038..33ac3677 100644
--- a/packages/saas-ui/app/components/CfSelect.vue
+++ b/packages/saas-ui/app/components/CfSelect.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import { computed, useSlots, type VNode } from 'vue'
+import { computed, normalizeClass, useSlots, type VNode } from 'vue'
defineOptions({ inheritAttrs: false })
const props = withDefaults(
defineProps<{ value?: string | number | boolean | null }>(),
@@ -58,11 +58,16 @@ function update(id: string) {
</script>
<template>
<USelect
- v-bind="$attrs"
+ v-bind="{ ...$attrs, class: undefined }"
:items="items"
value-key="id"
:model-value="selected"
- class="cf-select"
+ :class="[
+ 'cf-select',
+ normalizeClass($attrs.class)
+ .split(' ')
+ .filter((name) => name !== 'cf-input'),
+ ]"
@update:model-value="update"
/>
</template>