diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-01-15 12:37:36 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-01-15 12:37:36 +0000 |
| commit | 4a5134af02d37f41c9adefa4a88411d022f58a47 (patch) | |
| tree | 497e524a600f40c70e847eb174e135032631cb31 /src/components/attachment | |
| parent | f956b0ca37d33120bb4e28f3cc70b9cb6cec066f (diff) | |
| parent | a58a6d3c357592f34007c67bbf7fdf740864212a (diff) | |
Merge branch 'tusooa/1195-notif-overflow' into 'develop'
Fix notification attachment icon overflow
Closes #1195
See merge request pleroma/pleroma-fe!1759
Diffstat (limited to 'src/components/attachment')
| -rw-r--r-- | src/components/attachment/attachment.js | 4 | ||||
| -rw-r--r-- | src/components/attachment/attachment.scss | 7 | ||||
| -rw-r--r-- | src/components/attachment/attachment.vue | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 5dc50475..6e14b24d 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -36,6 +36,7 @@ library.add( const Attachment = { props: [ 'attachment', + 'compact', 'description', 'hideDescription', 'nsfw', @@ -71,7 +72,8 @@ const Attachment = { { '-loading': this.loading, '-nsfw-placeholder': this.hidden, - '-editable': this.edit !== undefined + '-editable': this.edit !== undefined, + '-compact': this.compact }, '-type-' + this.type, this.size && '-size-' + this.size, diff --git a/src/components/attachment/attachment.scss b/src/components/attachment/attachment.scss index b2dea98d..966acc68 100644 --- a/src/components/attachment/attachment.scss +++ b/src/components/attachment/attachment.scss @@ -102,7 +102,6 @@ padding-top: 0.5em; } - .play-icon { position: absolute; font-size: 64px; @@ -265,4 +264,10 @@ object-fit: cover; } } + + &.-compact { + .placeholder-container { + padding-bottom: 0.5em; + } + } } diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 2a89886d..79f62806 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -162,10 +162,11 @@ target="_blank" > <FAIcon - size="5x" + :size="compact ? '2x' : '5x'" :icon="placeholderIconClass" + :title="localDescription" /> - <p> + <p v-if="!compact"> {{ localDescription }} </p> </a> |
