Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-07-09 03:04:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): consistent merge people icons (#19473)

Browse Source 
fix(web): consistent merge icons
This commit is contained in:
Jason Rasmussen 2025-06-23 16:39:20 -04:00 committed by GitHub
parent 1923f1a887
commit ebcf133bea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
web/src/lib/modals/PersonMergeSuggestionModal.svelte
View File

@ -8,7 +8,7 @@
import { handleError } from '$lib/utils/handle-error'; import { handleError } from '$lib/utils/handle-error';
import { mergePerson, type PersonResponseDto } from '@immich/sdk'; import { mergePerson, type PersonResponseDto } from '@immich/sdk';
import { Button, HStack, IconButton, Modal, ModalBody, ModalFooter } from '@immich/ui'; import { Button, HStack, IconButton, Modal, ModalBody, ModalFooter } from '@immich/ui';
import { mdiArrowLeft, mdiMerge } from '@mdi/js'; import { mdiArrowLeft, mdiCallMerge, mdiSwapHorizontal } from '@mdi/js';
import { onMount, tick } from 'svelte'; import { onMount, tick } from 'svelte';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
import ImageThumbnail from '../components/assets/thumbnail/image-thumbnail.svelte'; import ImageThumbnail from '../components/assets/thumbnail/image-thumbnail.svelte';
@ -62,7 +62,7 @@
<Modal title="{$t('merge_people')} - {title}" {onClose}> <Modal title="{$t('merge_people')} - {title}" {onClose}>
<ModalBody> <ModalBody>
<div class="flex items-center justify-center py-4 md:h-36 md:py-4"> <div class="flex items-center justify-center gap-2 py-4 md:h-36">
{#if !choosePersonToMerge} {#if !choosePersonToMerge}
<div class="flex h-20 w-20 items-center px-1 md:h-24 md:w-24 md:px-2"> <div class="flex h-20 w-20 items-center px-1 md:h-24 md:w-24 md:px-2">
<ImageThumbnail <ImageThumbnail
@ -73,15 +73,24 @@
widthStyle="100%" widthStyle="100%"
/> />
</div> </div>
<div class="mx-0.5 flex md:mx-2">
<IconButton <div class="grid grid-rows-3">
shape="round" <div></div>
variant="ghost" <div class="flex flex-col h-full items-center justify-center">
color="secondary" <div class="flex h-full items-center justify-center">
aria-label={$t('swap_merge_direction')} <Icon path={mdiCallMerge} size={48} class="rotate-90 dark:text-white" />
icon={mdiMerge} </div>
onclick={() => ([personToMerge, personToBeMergedInto] = [personToBeMergedInto, personToMerge])} </div>
/> <div>
<IconButton
shape="round"
color="secondary"
variant="ghost"
aria-label={$t('swap_merge_direction')}
icon={mdiSwapHorizontal}
onclick={() => ([personToMerge, personToBeMergedInto] = [personToBeMergedInto, personToMerge])}
/>
</div>
</div> </div>
<button <button