From 874411990bda7ff1b5b6fce366dc771180fc31c9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 23 Jun 2018 22:55:32 +0900 Subject: [PATCH] :v: --- locales/ja.yml | 5 ++ .../desktop/views/pages/user/user.header.vue | 76 +++++++++++++++---- .../desktop/views/pages/user/user.profile.vue | 58 -------------- .../desktop/views/pages/user/user.twitter.vue | 21 +++++ .../app/desktop/views/pages/user/user.vue | 5 +- 5 files changed, 93 insertions(+), 72 deletions(-) create mode 100644 src/client/app/desktop/views/pages/user/user.twitter.vue diff --git a/locales/ja.yml b/locales/ja.yml index 21e43b662f..23ee6a625a 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -759,6 +759,11 @@ desktop/views/pages/user/user.profile.vue: muted: "ミュートしています" unmute: "ミュート解除" +desktop/views/pages/user/user.header.vue: + posts: "投稿" + following: "フォロー" + followers: "フォロワー" + desktop/views/pages/user/user.timeline.vue: default: "投稿" with-replies: "投稿と返信" 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 afb8de4b2a..76b7c3f381 100644 --- a/src/client/app/desktop/views/pages/user/user.header.vue +++ b/src/client/app/desktop/views/pages/user/user.header.vue @@ -5,19 +5,32 @@

{{ user | userName }}

-

-

%fa:map-marker%{{ user.profile.location }}

+
+ +

+

%fa:map-marker%{{ user.profile.location }}

+

%fa:birthday-cake%{{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }}歳)

+
- +
+ +
+
+ {{ user.notesCount | number }}%i18n:@posts% + {{ user.followingCount | number }}%i18n:@following% + {{ user.followersCount | number }}%i18n:@followers% +
@@ -118,7 +143,6 @@ root(isDark) width 100% padding 0 0 8px 154px color #5e6367 - font-family '游ゴシック', 'YuGothic', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'Meiryo', 'メイリオ', sans-serif > .name display block @@ -127,15 +151,15 @@ root(isDark) font-weight bold font-size 1.8em - > .username - > .location - display inline-block - margin 0 16px 0 0 - line-height 20px - opacity 0.8 + > div + > * + display inline-block + margin 0 16px 0 0 + line-height 20px + opacity 0.8 - > i - margin-right 4px + > i + margin-right 4px > .avatar display block @@ -151,6 +175,32 @@ root(isDark) padding 16px 16px 16px 154px color isDark ? #c5ced6 : #555 + > .status + margin-top 16px + padding-top 16px + border-top solid 1px rgba(#000, isDark ? 0.2 : 0.1) + font-size 80% + + > * + display inline-block + padding-right 16px + margin-right 16px + + &:not(:last-child) + border-right solid 1px rgba(#000, isDark ? 0.2 : 0.1) + + &.clickable + cursor pointer + + &:hover + color isDark ? #fff : #000 + + > b + margin-right 4px + font-size 1rem + font-weight bold + color $theme-color + .header[data-darkmode] root(true) 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 21f3c57c75..fda1db2849 100644 --- a/src/client/app/desktop/views/pages/user/user.profile.vue +++ b/src/client/app/desktop/views/pages/user/user.profile.vue @@ -15,25 +15,12 @@ -
-

%fa:birthday-cake%{{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }}歳)

-
- -
-

%fa:angle-right%{{ user.notesCount }}投稿

-

%fa:angle-right%{{ user.followingCount }}人をフォロー

-

%fa:angle-right%{{ user.followersCount }}人のフォロワー

-
+ + diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue index 5cea4b99e5..3123614c72 100644 --- a/src/client/app/desktop/views/pages/user/user.vue +++ b/src/client/app/desktop/views/pages/user/user.vue @@ -11,6 +11,7 @@
+ @@ -35,6 +36,7 @@ import XProfile from './user.profile.vue'; import XPhotos from './user.photos.vue'; import XFollowersYouKnow from './user.followers-you-know.vue'; import XFriends from './user.friends.vue'; +import XTwitter from './user.twitter.vue'; export default Vue.extend({ components: { @@ -43,7 +45,8 @@ export default Vue.extend({ XProfile, XPhotos, XFollowersYouKnow, - XFriends + XFriends, + XTwitter }, data() { return {