From 0e86681aba522f8c530a030b0e3c9745ec415eed Mon Sep 17 00:00:00 2001 From: taehoon Date: Wed, 27 Feb 2019 11:58:29 -0500 Subject: [PATCH] Merge all slots of BasicUserCard into one --- .../basic_user_card/basic_user_card.vue | 58 +++---------------- src/components/block_card/block_card.vue | 16 ++++- src/components/follow_card/follow_card.vue | 25 ++++++-- .../follow_request_card.vue | 12 ++-- 4 files changed, 46 insertions(+), 65 deletions(-) diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue index 0563360a..ff3d0d09 100644 --- a/src/components/basic_user_card/basic_user_card.vue +++ b/src/components/basic_user_card/basic_user_card.vue @@ -7,26 +7,16 @@
-
-
-
- - {{ user.name }} -
-
- - @{{user.screen_name}} - -
- -
-
- -
+
+ + {{ user.name }}
-
- +
+ + @{{user.screen_name}} +
+
@@ -52,19 +42,6 @@ margin-left: 0.7em; text-align: left; flex: 1; - min-width: 0; - } - - &-primary-secondary-wrapper { - display: flex; - align-items: flex-start; - justify-content: space-between; - } - - &-primary-area { - flex: 1; - margin-right: 1em; - min-width: 0; } &-user-name { @@ -76,15 +53,6 @@ } } - &-secondary-area { - flex: none; - - .btn { - margin-top: .5em; - width: 10em; - } - } - &-expanded-content { flex: 1; margin-left: 0.7em; @@ -106,15 +74,5 @@ margin-bottom: 0; } } - - @media (min-width: 320px) and (max-width: 480px) { - &-primary-secondary-wrapper { - flex-direction: column; - } - - &-primary-area { - margin-right: 0; - } - } } diff --git a/src/components/block_card/block_card.vue b/src/components/block_card/block_card.vue index ed7fe30b..8eb56e25 100644 --- a/src/components/block_card/block_card.vue +++ b/src/components/block_card/block_card.vue @@ -1,6 +1,6 @@ - \ No newline at end of file + + + diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue index 8e6dd2fb..1ae728a6 100644 --- a/src/components/follow_card/follow_card.vue +++ b/src/components/follow_card/follow_card.vue @@ -1,11 +1,9 @@ + + diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue index 45d02b89..4a3bbba4 100644 --- a/src/components/follow_request_card/follow_request_card.vue +++ b/src/components/follow_request_card/follow_request_card.vue @@ -1,18 +1,16 @@