sascha
/
immich
mirror of https://github.com/immich-app/immich.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(web): revert descriptions (#6582) 

fix: revert descriptions
pull/6590/head
martin 2024-01-23 03:53:56 +07:00 committed by GitHub
parent 773d093ace
commit 234a95960b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/lib/components/album-page/album-viewer.svelte
Unescape Escape View File

@ -159,9 +159,13 @@
{/if}
<!-- ALBUM DESCRIPTION -->
<p class="mb-12 mt-6 w-full pb-2 text-left text-lg font-medium dark:text-gray-300">
{album.description}
</p>
{#if album.description}
<p
class="whitespace-pre-line mb-12 mt-6 w-full pb-2 text-left font-medium text-base text-black dark:text-gray-300"
>
{album.description}
</p>
{/if}
</section>
</AssetGrid>
<UpdatePanel {assetStore} />

4
web/src/lib/components/asset-viewer/detail-panel.svelte
Unescape Escape View File

@ -214,7 +214,7 @@
</section>
{/if}
{#if isOwner || description !== ''}
{#if isOwner}
<section class="px-4 mt-10">
{#key asset.id}
<textarea
@ -233,6 +233,8 @@
/>
{/key}
</section>
{:else if description}
<p class="break-words whitespace-pre-line w-full text-black dark:text-white text-base">{description}</p>
{/if}
{#if !api.isSharedLink && people.length > 0}

23
web/src/routes/(user)/albums/[albumId]/+page.svelte
Unescape Escape View File

@ -653,16 +653,19 @@
</div>
{/if}
<!-- ALBUM DESCRIPTION -->
<textarea
class="w-full resize-none overflow-hidden text-black dark:text-white border-b-2 border-transparent border-gray-500 bg-transparent text-base outline-none transition-all focus:border-b-2 focus:border-immich-primary disabled:border-none dark:focus:border-immich-dark-primary hover:border-gray-400"
bind:this={textArea}
bind:value={description}
disabled={!isOwned}
on:input={() => autoGrowHeight(textArea)}
on:focusout={handleUpdateDescription}
use:autoGrowHeight
placeholder="Add description"
/>
{#if isOwned}
<textarea
class="w-full resize-none overflow-hidden text-black dark:text-white border-b-2 border-transparent border-gray-500 bg-transparent text-base outline-none transition-all focus:border-b-2 focus:border-immich-primary disabled:border-none dark:focus:border-immich-dark-primary hover:border-gray-400"
bind:this={textArea}
bind:value={description}
on:input={() => autoGrowHeight(textArea)}
on:focusout={handleUpdateDescription}
use:autoGrowHeight
placeholder="Add description"
/>
{:else if description}
<p class="break-words whitespace-pre-line w-full text-black dark:text-white text-base">{description}</p>
{/if}
</section>
{/if}