Skip to content

A self-hosted media server and file management system

fix: general folder view style consistency

aminnausin7cb9ec1ccc25
diff --git a/resources/js/components/folders/FolderDescription.vue b/resources/js/components/folders/FolderDescription.vue
index cf744e58..f0e6a266 100644
--- a/resources/js/components/folders/FolderDescription.vue
+++ b/resources/js/components/folders/FolderDescription.vue
@@ -140,7 +140,11 @@ onMounted(() => {
</article>
<div :class="cn('grid grid-cols-1 gap-2', { '@3xs:grid-cols-3': stats.length >= 3 }, { '@3xs:grid-cols-2 @sm:grid-cols-4': stats.length >= 4 })" v-if="data.series">
- <div class="bg-surface-3 flex flex-col items-center justify-center gap-0.5 rounded-lg p-3 text-center" v-for="stat in stats" :key="stat.label">
+ <div
+ class="bg-surface-3/50 dark:bg-surface-3 flex flex-col items-center justify-center gap-0.5 rounded-lg p-3 text-center shadow-sm dark:shadow-none"
+ v-for="stat in stats"
+ :key="stat.label"
+ >
<span class="text-base font-semibold">{{ stat.value ?? '—' }}</span>
<span class="text-foreground-2">{{ stat.label }}</span>
</div>
diff --git a/resources/js/components/folders/FolderMedia.vue b/resources/js/components/folders/FolderMedia.vue
index 4daacdfc..f4780e4a 100644
--- a/resources/js/components/folders/FolderMedia.vue
+++ b/resources/js/components/folders/FolderMedia.vue
@@ -21,7 +21,6 @@ import FolderTab from '@/components/folders/FolderTab.vue';
const { searchQuery, stateFilteredPlaylist, stateDirectory, stateVideo, stateFolder, currentMediaIndex, isLoadingContent } = storeToRefs(useContentStore());
const { playlistSort } = useContentStore();
-const props = defineProps<{ useBackground?: boolean }>();
const modal = useModalStore();
const sortingOptions = computed(() => mediaSortingOptions(stateFolder.value)) satisfies ComputedRef<GenericSortOption<VideoResource>[]>; // Idk what the point of using satisfies is
@@ -66,7 +65,7 @@ const handleVideoAction = (e: Event, id: number, action: 'edit' | 'share' | 'dow
</script>
<template>
- <FolderTab :class="cn('flex-1', { 'bg-transparent p-0 shadow-none ring-0': !useBackground })">
+ <FolderTab :class="cn('flex-1')">
<TableBase
ref="mediaTable"
:class="'h-full flex-1'"
diff --git a/resources/js/components/folders/FolderOverview.vue b/resources/js/components/folders/FolderOverview.vue
index 4d4cf0d5..ce7723d2 100644
--- a/resources/js/components/folders/FolderOverview.vue
+++ b/resources/js/components/folders/FolderOverview.vue
@@ -8,6 +8,6 @@ import FolderMedia from '@/components/folders/FolderMedia.vue';
<FolderDescription />
<div class="flex flex-1 flex-col gap-3 @[40rem]:flex-row">
<FolderOverviewSidebar />
- <FolderMedia :useBackground="true" />
+ <FolderMedia />
</div>
</template>
diff --git a/resources/js/views/FolderView.vue b/resources/js/views/FolderView.vue
index 33535c1e..32232d1b 100644
--- a/resources/js/views/FolderView.vue
+++ b/resources/js/views/FolderView.vue
@@ -51,12 +51,12 @@ const popoverItems = computed<PopoverItem[]>(() => [
action: () => modal.open(EditFolderModal, { cachedFolder: stateFolder }),
hidden: !isAuthenticated.value || activeFolderTab.value?.name === 'metadata',
},
- { divider: true, hidden: !isAuthenticated.value || activeFolderTab.value?.name === 'images' },
+ { divider: true, hidden: !isAuthenticated.value },
{
icon: ProiconsPhoto,
text: 'Edit Images',
action: () => handleEditFolderImages(stateFolder.value),
- hidden: !isAuthenticated.value || activeFolderTab.value?.name === 'images',
+ hidden: !isAuthenticated.value,
},
]);
@@ -195,15 +195,9 @@ provide(
<CircumMonitor class="size-4" />
<span class="hidden leading-none sm:block">Watch</span>
</ButtonText>
- <ButtonText
- v-if="activeFolderTab?.name === 'images' && isAuthenticated"
- class="gap-1 sm:px-2"
- title="Edit Folder Images"
- @click="handleEditFolderImages(stateFolder)"
- >
+ <ButtonIcon v-if="activeFolderTab?.name === 'images' && isAuthenticated" title="Edit Folder Images" @click="handleEditFolderImages(stateFolder)">
<ProiconsPhoto class="size-4" />
- <span class="hidden leading-none sm:block">Edit</span>
- </ButtonText>
+ </ButtonIcon>
<ButtonIcon
v-if="activeFolderTab?.name === 'metadata' && isAuthenticated"
title="Edit Folder Metadata"