Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(web): remove black bezels + better integrate ActivityStatus #10667

Merged
merged 5 commits into from
Jul 1, 2024
Merged

fix(web): remove black bezels + better integrate ActivityStatus #10667

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c41d6d
remove black bezels + better integrate activity status
pyorot Jun 27, 2024
e60612b
remove justify-self-end + mr-4 → mr-3 (closer to desired spacing)
pyorot Jun 28, 2024
996c82b
clean up
alextran1502 Jul 1, 2024
0a308d4
clean up some more
alextran1502 Jul 1, 2024
82e3319
lint and format
alextran1502 Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions web/src/lib/components/asset-viewer/activity-status.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
import { mdiCommentOutline, mdiHeart, mdiHeartOutline } from '@mdi/js';
import { createEventDispatcher } from 'svelte';
import Icon from '../elements/icon.svelte';
import { t } from 'svelte-i18n';

export let isLiked: ActivityResponseDto | null;
export let numberOfComments: number | undefined;
export let isShowActivity: boolean | undefined;
export let disabled: boolean;

const dispatch = createEventDispatcher<{
Expand All @@ -16,9 +14,7 @@
}>();
</script>

<div
class="w-full h-14 flex p-4 text-white items-center justify-center rounded-full gap-4 bg-immich-dark-bg bg-opacity-60"
>
<div class="w-full flex text-white items-center justify-center rounded-full gap-4 bg-immich-dark-bg bg-opacity-60">
<button type="button" class={disabled ? 'cursor-not-allowed' : ''} on:click={() => dispatch('favorite')} {disabled}>
<div class="items-center justify-center">
<Icon path={isLiked ? mdiHeart : mdiHeartOutline} size={24} />
Expand All @@ -29,8 +25,6 @@
<Icon path={mdiCommentOutline} class="scale-x-[-1]" size={24} />
{#if numberOfComments}
<div class="text-xl">{numberOfComments}</div>
{:else if !isShowActivity}
<div class="text-lg">{$t('say_something')}</div>
{/if}
</div>
</button>
Expand Down
3 changes: 1 addition & 2 deletions web/src/lib/components/asset-viewer/asset-viewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,12 +682,11 @@
/>
{/if}
{#if $slideshowState === SlideshowState.None && isShared && ((album && album.isActivityEnabled) || numberOfComments > 0)}
<div class="z-[9999] absolute bottom-0 right-0 mb-4 mr-6">
<div class="z-[9999] absolute bottom-0 right-0 mb-20 mr-8">
<ActivityStatus
disabled={!album?.isActivityEnabled}
{isLiked}
{numberOfComments}
{isShowActivity}
on:favorite={handleFavorite}
on:openActivityTab={handleOpenActivity}
/>
Expand Down
3 changes: 1 addition & 2 deletions web/src/lib/components/asset-viewer/video-native-viewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@

<div
transition:fade={{ duration: 150 }}
class="flex select-none place-content-center place-items-center"
style="height: calc(100% - 64px)"
class="flex h-full select-none place-content-center place-items-center"
>
<video
bind:this={element}
Expand Down
Loading