diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-12-09 13:25:46 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-12-09 13:25:46 +0900 |
| commit | 3acd2e0f0cd77bf88228dede5e01aaab45c1cad4 (patch) | |
| tree | 33fd3dc3aa543b5fe9d0353beee4cd00329505ff /src/client | |
| parent | Revert "Eliminate if-statement (#3556)" (diff) | |
| download | misskey-3acd2e0f0cd77bf88228dede5e01aaab45c1cad4.tar.gz misskey-3acd2e0f0cd77bf88228dede5e01aaab45c1cad4.tar.bz2 misskey-3acd2e0f0cd77bf88228dede5e01aaab45c1cad4.zip | |
:art:
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/messaging-room.message.vue | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue index 758ce2c273..fa77fa7af1 100644 --- a/src/client/app/common/views/components/messaging-room.message.vue +++ b/src/client/app/common/views/components/messaging-room.message.vue @@ -10,7 +10,8 @@ <misskey-flavored-markdown class="text" v-if="message.text" ref="text" :text="message.text" :i="$store.state.i"/> <div class="file" v-if="message.file"> <a :href="message.file.url" target="_blank" :title="message.file.name"> - <img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"/> + <img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name" + :style="{ backgroundColor: message.file.properties.avgColor && message.file.properties.avgColor.length == 3 ? `rgb(${message.file.properties.avgColor.join(',')})` : 'transparent' }"/> <p v-else>{{ message.file.name }}</p> </a> </div> @@ -150,7 +151,6 @@ export default Vue.extend({ > a display block max-width 100% - max-height 512px border-radius 16px overflow hidden text-decoration none @@ -165,7 +165,8 @@ export default Vue.extend({ display block margin 0 width 100% - height 100% + max-height 512px + object-fit contain > p padding 30px |