c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-01 08:31:59 +00:00
Code Releases Activity

fix(web): revert descriptions (#6582)

Browse source 
fix: revert descriptions
This commit is contained in:
martin 2024-01-23 03:53:56 +01: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
View file

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

4
web/src/lib/components/asset-viewer/detail-panel.svelte
View file

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

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

@ -653,16 +653,19 @@
</div> </div>
{/if} {/if}
<!-- ALBUM DESCRIPTION --> <!-- ALBUM DESCRIPTION -->
<textarea {#if isOwned}
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" <textarea
bind:this={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:value={description} bind:this={textArea}
disabled={!isOwned} bind:value={description}
on:input={() => autoGrowHeight(textArea)} on:input={() => autoGrowHeight(textArea)}
on:focusout={handleUpdateDescription} on:focusout={handleUpdateDescription}
use:autoGrowHeight use:autoGrowHeight
placeholder="Add description" 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> </section>
{/if} {/if}