Merge branch 'open-webui:dev' into dev

This commit is contained in:
Classic298 2025-06-10 12:37:51 +02:00 committed by GitHub
commit c9fde5cec7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 42 deletions

View File

@ -410,10 +410,10 @@
</div>
{/if}
<div class="px-3 max-h-64 overflow-y-auto group relative">
<div class="px-3">
{#if tags && items.filter((item) => !(item.model?.info?.meta?.hidden ?? false)).length > 0}
<div
class=" flex w-full sticky top-0 z-10 bg-white dark:bg-gray-850 overflow-x-auto scrollbar-none"
class=" flex w-full bg-white dark:bg-gray-850 overflow-x-auto scrollbar-none"
on:wheel={(e) => {
if (e.deltaY !== 0) {
e.preventDefault();
@ -495,7 +495,9 @@
</div>
</div>
{/if}
</div>
<div class="px-3 max-h-64 overflow-y-auto group relative">
{#each filteredItems as item, index}
<ModelItem
{selectedModelIdx}

View File

@ -645,8 +645,13 @@
</div>
{/if}
<div
class="relative flex flex-col flex-1 overflow-y-auto overflow-x-hidden {$temporaryChatEnabled
? 'opacity-20'
: ''}"
>
{#if ($models ?? []).length > 0 && ($settings?.pinnedModels ?? []).length > 0}
<div class="py-1">
<div class="mt-0.5">
{#each $settings.pinnedModels as modelId (modelId)}
{@const model = $models.find((model) => model.id === modelId)}
{#if model}
@ -685,11 +690,6 @@
</div>
{/if}
<div
class="relative flex flex-col flex-1 overflow-y-auto overflow-x-hidden {$temporaryChatEnabled
? 'opacity-20'
: ''}"
>
{#if $config?.features?.enable_channels && ($user?.role === 'admin' || $channels.length > 0)}
<Folder
className="px-2 mt-0.5"