summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2020-02-13 22:13:35 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2020-02-13 22:13:35 +0900
commita5653e33d393a4d45d693bb8841bbaf882dbf5b7 (patch)
tree7c7d2669c41b469c1ccaa6877f1025585349a531 /src
parentClean up (diff)
parentFix For Messaging Icon (#5933) (diff)
downloadsharkey-a5653e33d393a4d45d693bb8841bbaf882dbf5b7.tar.gz
sharkey-a5653e33d393a4d45d693bb8841bbaf882dbf5b7.tar.bz2
sharkey-a5653e33d393a4d45d693bb8841bbaf882dbf5b7.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src')
-rw-r--r--src/client/assets/remove.pngbin0 -> 424 bytes
-rw-r--r--src/client/pages/messaging-room.message.vue2
2 files changed, 1 insertions, 1 deletions
diff --git a/src/client/assets/remove.png b/src/client/assets/remove.png
new file mode 100644
index 0000000000..c2e222a0fc
--- /dev/null
+++ b/src/client/assets/remove.png
Binary files differ
diff --git a/src/client/pages/messaging-room.message.vue b/src/client/pages/messaging-room.message.vue
index bfb6b73ad8..ca0f231ade 100644
--- a/src/client/pages/messaging-room.message.vue
+++ b/src/client/pages/messaging-room.message.vue
@@ -4,7 +4,7 @@
<div class="content">
<div class="balloon _panel" :data-no-text="message.text == null">
<button class="delete-button" v-if="isMe" :title="$t('delete')" @click="del">
- <img src="/assets/desktop/remove.png" alt="Delete"/>
+ <img src="/assets/remove.png" alt="Delete"/>
</button>
<div class="content" v-if="!message.isDeleted">
<mfm class="text" v-if="message.text" ref="text" :text="message.text" :i="$store.state.i"/>