summaryrefslogtreecommitdiff
path: root/src/server/web/app/mobile/views/components/user-card.vue
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/web/app/mobile/views/components/user-card.vue
parentresolve conflict (diff)
downloadmisskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/web/app/mobile/views/components/user-card.vue')
-rw-r--r--src/server/web/app/mobile/views/components/user-card.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/web/app/mobile/views/components/user-card.vue b/src/server/web/app/mobile/views/components/user-card.vue
index 5a7309cfd3..ffa1100519 100644
--- a/src/server/web/app/mobile/views/components/user-card.vue
+++ b/src/server/web/app/mobile/views/components/user-card.vue
@@ -1,8 +1,8 @@
<template>
<div class="mk-user-card">
- <header :style="user.banner_url ? `background-image: url(${user.banner_url}?thumbnail&size=1024)` : ''">
+ <header :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=1024)` : ''">
<a :href="`/@${acct}`">
- <img :src="`${user.avatar_url}?thumbnail&size=200`" alt="avatar"/>
+ <img :src="`${user.avatarUrl}?thumbnail&size=200`" alt="avatar"/>
</a>
</header>
<a class="name" :href="`/@${acct}`" target="_blank">{{ user.name }}</a>