Skip to content

Commit 4743a08

Browse files
authored
fix: more z-index issue (#18598)
* fix: search suggestion * fix: play icon lay on top of the search bar
1 parent 911c877 commit 4743a08

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

web/src/lib/components/assets/thumbnail/video-thumbnail.svelte

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,6 @@
5555
};
5656
</script>
5757

58-
<div class="absolute end-0 top-0 z-1 flex place-items-center gap-1 text-xs font-medium text-white">
59-
{#if showTime}
60-
<span class="pt-2">
61-
{#if remainingSeconds < 60}
62-
{Duration.fromObject({ seconds: remainingSeconds }).toFormat('m:ss')}
63-
{:else if remainingSeconds < 3600}
64-
{Duration.fromObject({ seconds: remainingSeconds }).toFormat('mm:ss')}
65-
{:else}
66-
{Duration.fromObject({ seconds: remainingSeconds }).toFormat('h:mm:ss')}
67-
{/if}
68-
</span>
69-
{/if}
70-
71-
<!-- svelte-ignore a11y_no_static_element_interactions -->
72-
<span class="pe-2 pt-2" onmouseenter={onMouseEnter} onmouseleave={onMouseLeave}>
73-
{#if enablePlayback}
74-
{#if loading}
75-
<LoadingSpinner />
76-
{:else if error}
77-
<Icon path={mdiAlertCircleOutline} size="24" class="text-red-600" />
78-
{:else}
79-
<Icon path={pauseIcon} size="24" />
80-
{/if}
81-
{:else}
82-
<Icon path={playIcon} size="24" />
83-
{/if}
84-
</span>
85-
</div>
86-
8758
{#if enablePlayback}
8859
<video
8960
bind:this={player}
@@ -114,3 +85,32 @@
11485
}}
11586
></video>
11687
{/if}
88+
89+
<div class="absolute end-0 top-0 flex place-items-center gap-1 text-xs font-medium text-white">
90+
{#if showTime}
91+
<span class="pt-2">
92+
{#if remainingSeconds < 60}
93+
{Duration.fromObject({ seconds: remainingSeconds }).toFormat('m:ss')}
94+
{:else if remainingSeconds < 3600}
95+
{Duration.fromObject({ seconds: remainingSeconds }).toFormat('mm:ss')}
96+
{:else}
97+
{Duration.fromObject({ seconds: remainingSeconds }).toFormat('h:mm:ss')}
98+
{/if}
99+
</span>
100+
{/if}
101+
102+
<!-- svelte-ignore a11y_no_static_element_interactions -->
103+
<span class="pe-2 pt-2" onmouseenter={onMouseEnter} onmouseleave={onMouseLeave}>
104+
{#if enablePlayback}
105+
{#if loading}
106+
<LoadingSpinner />
107+
{:else if error}
108+
<Icon path={mdiAlertCircleOutline} size="24" class="text-red-600" />
109+
{:else}
110+
<Icon path={pauseIcon} size="24" />
111+
{/if}
112+
{:else}
113+
<Icon path={playIcon} size="24" />
114+
{/if}
115+
</span>
116+
</div>

web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<svelte:window bind:innerWidth />
5454

55-
<nav id="dashboard-navbar" class="max-md:h-(--navbar-height-md) h-(--navbar-height) w-dvw text-sm overflow-hidden">
55+
<nav id="dashboard-navbar" class="max-md:h-(--navbar-height-md) h-(--navbar-height) w-dvw text-sm">
5656
<SkipLink text={$t('skip_to_content')} />
5757
<div
5858
class="grid h-full grid-cols-[--spacing(32)_auto] items-center py-2 sidebar:grid-cols-[--spacing(64)_auto] {noBorder

web/src/lib/components/shared-components/search-bar/search-bar.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
]}
215215
/>
216216

217-
<div class="w-full relative" use:focusOutside={{ onFocusOut }} tabindex="-1">
217+
<div class="w-full relative z-2" use:focusOutside={{ onFocusOut }} tabindex="-1">
218218
<form
219219
draggable="false"
220220
autocomplete="off"

web/src/lib/components/shared-components/search-bar/search-history-box.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<script lang="ts">
2+
import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
23
import Icon from '$lib/components/elements/icon.svelte';
34
import { searchStore } from '$lib/stores/search.svelte';
4-
import { mdiMagnify, mdiClose } from '@mdi/js';
5-
import { fly } from 'svelte/transition';
5+
import { mdiClose, mdiMagnify } from '@mdi/js';
66
import { t } from 'svelte-i18n';
7-
import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
7+
import { fly } from 'svelte/transition';
88
99
interface Props {
1010
id: string;
@@ -95,7 +95,7 @@
9595
{#if isOpen && isSearchSuggestions}
9696
<div
9797
transition:fly={{ y: 25, duration: 150 }}
98-
class="absolute w-full rounded-b-3xl border-2 border-t-0 border-gray-200 bg-white pb-5 shadow-2xl transition-all dark:border-gray-700 dark:bg-immich-dark-gray dark:text-gray-300"
98+
class="absolute w-full rounded-b-3xl border-2 border-t-0 border-gray-200 bg-white pb-5 shadow-2xl transition-all dark:border-gray-700 dark:bg-immich-dark-gray dark:text-gray-300 z-1"
9999
>
100100
<div class="flex items-center justify-between px-5 pt-5 text-xs">
101101
<p class="py-2" aria-hidden={true}>{$t('recent_searches').toUpperCase()}</p>

0 commit comments

Comments
 (0)