summaryrefslogtreecommitdiff
path: root/src/client/app/mobile
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-06 04:28:42 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-06 04:28:42 +0900
commitccf8e44acc8b4bcdb19895ce60cd86d699efcbf7 (patch)
treec313e84c98b54934ef0f24922610ff5e0f60a751 /src/client/app/mobile
parentImprove welcome page (diff)
parentShow host in local user detail (#2634) (diff)
downloadmisskey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.tar.gz
misskey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.tar.bz2
misskey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client/app/mobile')
-rw-r--r--src/client/app/mobile/views/components/drive.file-detail.vue2
-rw-r--r--src/client/app/mobile/views/pages/user.vue2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/app/mobile/views/components/drive.file-detail.vue b/src/client/app/mobile/views/components/drive.file-detail.vue
index 43867211e9..8108892597 100644
--- a/src/client/app/mobile/views/components/drive.file-detail.vue
+++ b/src/client/app/mobile/views/components/drive.file-detail.vue
@@ -67,7 +67,7 @@
import Vue from 'vue';
import * as EXIF from 'exif-js';
import * as hljs from 'highlight.js';
-import gcd from '../../../common/scripts/gcd';
+import { gcd } from '../../../../../prelude/math';
export default Vue.extend({
props: ['file'],
diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue
index ddea43c9f2..c1082f31a9 100644
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@@ -16,7 +16,7 @@
</div>
<div class="title">
<h1>{{ user | userName }}</h1>
- <span class="username"><mk-acct :user="user"/></span>
+ <span class="username"><mk-acct :user="user" :detail="true" /></span>
<span class="followed" v-if="user.isFollowed">%i18n:@follows-you%</span>
</div>
<div class="description">