diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-11 18:53:34 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-11 18:53:34 +0000 |
| commit | 7c26435e66fd7e142ea4b88fbe51eede32eeb5ce (patch) | |
| tree | d7b4ea789ceaaa8e5dacd7e74100962853853132 /src/components/user_panel/user_panel.vue | |
| parent | 7e9c8c3d219aa3b787c5606efbb54a73c1738b07 (diff) | |
| parent | f397537642a6b8a4079d8d45d835ddd50f2d2b4a (diff) | |
Merge branch 'develop' into 'master'
Update master with bugfixes (and other changes)
See merge request pleroma/pleroma-fe!673
Diffstat (limited to 'src/components/user_panel/user_panel.vue')
| -rw-r--r-- | src/components/user_panel/user_panel.vue | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue index 2d5cb500..8310f30e 100644 --- a/src/components/user_panel/user_panel.vue +++ b/src/components/user_panel/user_panel.vue @@ -1,7 +1,7 @@ <template> <div class="user-panel"> <div v-if='user' class="panel panel-default" style="overflow: visible;"> - <user-card-content :user="user" :switcher="false" :hideBio="true"></user-card-content> + <UserCard :user="user" :hideBio="true" rounded="top"/> <div class="panel-footer"> <post-status-form v-if='user'></post-status-form> </div> @@ -11,13 +11,3 @@ </template> <script src="./user_panel.js"></script> - -<style lang="scss"> -.user-panel { - .profile-panel-background .panel-heading { - background: transparent; - flex-direction: column; - align-items: stretch; - } -} -</style> |