aboutsummaryrefslogtreecommitdiff
path: root/src/components/basic_user_card/basic_user_card.js
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/basic_user_card/basic_user_card.js
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/basic_user_card/basic_user_card.js')
-rw-r--r--src/components/basic_user_card/basic_user_card.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js
index a8441446..87085a28 100644
--- a/src/components/basic_user_card/basic_user_card.js
+++ b/src/components/basic_user_card/basic_user_card.js
@@ -1,4 +1,4 @@
-import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserCard from '../user_card/user_card.vue'
import UserAvatar from '../user_avatar/user_avatar.vue'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -12,7 +12,7 @@ const BasicUserCard = {
}
},
components: {
- UserCardContent,
+ UserCard,
UserAvatar
},
methods: {