aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_profile/user_profile.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-03-07 16:38:45 +0000
committerShpuld Shpludson <shp@cock.li>2019-03-07 16:38:45 +0000
commit09736691ea79e66c9e41d6f723384769088eb2d0 (patch)
tree196547dfc320ee2ee1173d6d807271e2c1f2fb09 /src/components/user_profile/user_profile.vue
parent82cd1252b58cce7fd32aafb89a21865715c23eb3 (diff)
parent5f51fe897dcd7d32c46a67a8d31c8b4ffc8858b2 (diff)
Merge branch '420-redo-user-card-content' into 'develop'
Re-do UserCardContent Component CSS Closes #420 See merge request pleroma/pleroma-fe!642
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
-rw-r--r--src/components/user_profile/user_profile.vue11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 8090efa5..7d4a8b1f 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -1,11 +1,7 @@
<template>
<div>
<div v-if="user.id" class="user-profile panel panel-default">
- <user-card-content
- :user="user"
- :switcher="true"
- :selected="timeline.viewing"
- />
+ <UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/>
<tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
<Timeline
:label="$t('user_card.statuses')"
@@ -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;