diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2020-12-02 22:22:04 -0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 22:22:04 -0100 |
| commit | 381c5105aa4047e8057890b3cbb557c4e672bd99 (patch) | |
| tree | b1df92469ff5bf94ed67911f8b1a9751bb16ba68 | |
| parent | 5af2d96907c06d7a3d4e357d94832733d9237c13 (diff) | |
| parent | 0b536bd83118a507ed4d5165c3d4eee3317712f4 (diff) | |
Merge pull request #1068 from nextcloud/profile-numbers-inline
show profile numbers inline instead of next to the name and avatar
| -rw-r--r-- | src/components/ProfileInfo.vue | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/components/ProfileInfo.vue b/src/components/ProfileInfo.vue index 899494a2..53a1e8b9 100644 --- a/src/components/ProfileInfo.vue +++ b/src/components/ProfileInfo.vue @@ -22,23 +22,11 @@ <template> <div v-if="profileAccount && accountInfo" class="user-profile"> - <div> - <avatar v-if="accountInfo.local" :user="localUid" :disable-tooltip="true" - :size="128" /> - <avatar v-else :url="avatarUrl" :disable-tooltip="true" - :size="128" /> - <h2>{{ displayName }}</h2> - <p>@{{ accountInfo.account }}</p> - <p v-if="accountInfo.website"> - Website: <a :href="accountInfo.website.value"> - {{ accountInfo.website.value }} - </a> - </p> - <follow-button :account="accountInfo.account" :uid="uid" /> - <button v-if="serverData.public" class="primary" @click="followRemote"> - {{ t('social', 'Follow') }} - </button> - </div> + <avatar v-if="accountInfo.local" :user="localUid" :disable-tooltip="true" + :size="128" /> + <avatar v-else :url="avatarUrl" :disable-tooltip="true" + :size="128" /> + <h2>{{ displayName }}</h2> <!-- TODO: we have no details, timeline and follower list for non-local accounts for now --> <ul v-if="accountInfo.details && accountInfo.local" class="user-profile--sections"> <li> @@ -57,17 +45,28 @@ </router-link> </li> </ul> + <p>@{{ accountInfo.account }}</p> + <p v-if="accountInfo.website"> + Website: <a :href="accountInfo.website.value"> + {{ accountInfo.website.value }} + </a> + </p> + <follow-button :account="accountInfo.account" :uid="uid" /> + <button v-if="serverData.public" class="primary" @click="followRemote"> + {{ t('social', 'Follow') }} + </button> </div> </template> <style scoped> .user-profile { display: flex; flex-wrap: wrap; + flex-direction: column; justify-content: space-between; width: 100%; text-align: center; padding-top: 20px; - align-items: flex-end; + align-items: center; margin-bottom: 20px; } h2 { @@ -76,7 +75,6 @@ .user-profile--sections { display: flex; - margin-bottom: 30px; } .user-profile--sections li { flex-grow: 1; |