diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/desktop/views/pages/user/user.header.vue | 18 | ||||
| -rw-r--r-- | src/client/app/desktop/views/pages/user/user.profile.vue | 8 | ||||
| -rw-r--r-- | src/client/app/desktop/views/pages/user/user.vue | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/src/client/app/desktop/views/pages/user/user.header.vue b/src/client/app/desktop/views/pages/user/user.header.vue index ab0880d9bd..00545723e2 100644 --- a/src/client/app/desktop/views/pages/user/user.header.vue +++ b/src/client/app/desktop/views/pages/user/user.header.vue @@ -6,10 +6,10 @@ <div class="title"> <p class="name">{{ user | userName }}</p> <div> - <p v-if="user.isBot" title="%i18n:@is-bot%">%fa:robot%</p> - <p class="username"><mk-acct :user="user"/></p> - <p class="location" v-if="user.host === null && user.profile.location">%fa:map-marker% {{ user.profile.location }}</p> - <p class="birthday" v-if="user.host === null && user.profile.birthday">%fa:birthday-cake% {{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }}歳)</p> + <span class="username"><mk-acct :user="user"/></span> + <span v-if="user.isBot" title="%i18n:@is-bot%">%fa:robot%</span> + <span class="location" v-if="user.host === null && user.profile.location">%fa:map-marker% {{ user.profile.location }}</span> + <span class="birthday" v-if="user.host === null && user.profile.birthday">%fa:birthday-cake% {{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }}歳)</span> </div> </div> </div> @@ -31,6 +31,7 @@ import Vue from 'vue'; import MkFollowingWindow from '../../components/following-window.vue'; import MkFollowersWindow from '../../components/followers-window.vue'; +import * as age from 's-age'; export default Vue.extend({ props: ['user'], @@ -41,6 +42,10 @@ export default Vue.extend({ backgroundColor: this.user.bannerColor && this.user.bannerColor.length == 3 ? `rgb(${ this.user.bannerColor.join(',') })` : null, backgroundImage: `url(${ this.user.bannerUrl })` }; + }, + + age(): number { + return age(this.user.profile.birthday); } }, mounted() { @@ -154,10 +159,13 @@ root(isDark) > div > * display inline-block - margin 0 16px 0 0 + margin-right 16px line-height 20px opacity 0.8 + &.username + font-weight bold + > .avatar display block position absolute diff --git a/src/client/app/desktop/views/pages/user/user.profile.vue b/src/client/app/desktop/views/pages/user/user.profile.vue index fda1db2849..0134d6f0be 100644 --- a/src/client/app/desktop/views/pages/user/user.profile.vue +++ b/src/client/app/desktop/views/pages/user/user.profile.vue @@ -20,18 +20,12 @@ <script lang="ts"> import Vue from 'vue'; -import * as age from 's-age'; import MkUserListsWindow from '../../components/user-lists-window.vue'; export default Vue.extend({ props: ['user'], - computed: { - age(): number { - return age(this.user.profile.birthday); - } - }, - methods: { + methods: { stalk() { (this as any).api('following/stalk', { userId: this.user.id diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue index 3123614c72..0337befdbd 100644 --- a/src/client/app/desktop/views/pages/user/user.vue +++ b/src/client/app/desktop/views/pages/user/user.vue @@ -11,7 +11,7 @@ </div> <div class="side"> <x-profile :user="user"/> - <a-twitter :user="user" v-if="user.host === null && user.twitter"/> + <x-twitter :user="user" v-if="user.host === null && user.twitter"/> <mk-calendar @chosen="warp" :start="new Date(user.createdAt)"/> <mk-activity :user="user"/> <x-photos :user="user"/> |