diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-10-29 08:36:39 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-10-29 08:36:39 +0200 |
| commit | cb3578fcca763a43ec946af75e6e345ed5adc14a (patch) | |
| tree | 85fdd3f8bf98eae557d33ca1a82e3688e4e7f309 /src/components/attachment/attachment.vue | |
| parent | 7007659e05842dc06eb2c13eddaba6ab657df5ea (diff) | |
| parent | a84db4bd8f04bdfc14836f55f441aa8478265291 (diff) | |
fix conflicts
Diffstat (limited to 'src/components/attachment/attachment.vue')
| -rw-r--r-- | src/components/attachment/attachment.vue | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 19c713d5..f1fac2c8 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -12,7 +12,7 @@ :alt="attachment.description" :title="attachment.description" > - <span :class="placeholderIconClass" /> + <FAIcon :icon="placeholderIconClass" /> <b>{{ nsfw ? "NSFW / " : "" }}</b>{{ placeholderName }} </a> </div> @@ -36,9 +36,10 @@ :src="nsfwImage" :class="{'small': isSmall}" > - <i + <FAIcon v-if="type === 'video'" - class="play-icon icon-play-circled" + class="play-icon" + icon="play-circle" /> </a> <div @@ -83,9 +84,10 @@ @play="$emit('play')" @pause="$emit('pause')" /> - <i + <FAIcon v-if="!allowPlay" - class="play-icon icon-play-circled" + class="play-icon" + icon="play-circle" /> </a> @@ -142,6 +144,10 @@ white-space: nowrap; text-overflow: ellipsis; max-width: 100%; + + svg { + color: inherit; + } } .nsfw-placeholder { |