diff options
| author | shpuld <shp@cock.li> | 2019-03-12 23:50:54 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-03-12 23:50:54 +0200 |
| commit | 7ce8fe92141cde52e3f47d555bd6c604e1a673ed (patch) | |
| tree | 226eff9fcc01b2b2675c37075a7ab9056466060c /src/components/user_profile/user_profile.vue | |
| parent | c7e180080afd0e255e439030df800f79d33ff5de (diff) | |
| parent | f397537642a6b8a4079d8d45d835ddd50f2d2b4a (diff) | |
merge develop, add mobile nav component
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index a3d2825f..7d4a8b1f 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -1,12 +1,8 @@ <template> <div> <div v-if="user.id" class="user-profile panel panel-default"> - <user-card-content - :user="user" - :switcher="true" - :selected="timeline.viewing" - /> - <tab-switcher :renderOnlyFocused="true"> + <UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/> + <tab-switcher :renderOnlyFocused="true" ref="tabSwitcher"> <Timeline :label="$t('user_card.statuses')" :disabled="!user.statuses_count" @@ -64,11 +60,6 @@ flex: 2; flex-basis: 500px; - .profile-panel-background .panel-heading { - background: transparent; - flex-direction: column; - align-items: stretch; - } .userlist-placeholder { display: flex; justify-content: center; |