diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-02-18 11:27:54 -0500 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-02-18 11:27:54 -0500 |
| commit | 44b6a90fc56b4f02c9220af94d93a01932728f7d (patch) | |
| tree | 52dc97f43bbd05d3e2f6c3ffc578d9535ad2c7e2 /src/components/user_card_content/user_card_content.vue | |
| parent | 4e366f27a17f4f50282903b7190fb29452ee33dc (diff) | |
| parent | 15c82dea62120b097e35f1443748c5996141a730 (diff) | |
Merge branch 'develop' into 'develop'
Make user card look neater
See merge request !16
Diffstat (limited to 'src/components/user_card_content/user_card_content.vue')
| -rw-r--r-- | src/components/user_card_content/user_card_content.vue | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 2c32406b..0ee1d86f 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -3,30 +3,34 @@ <div class="base00-background panel-heading text-center" v-bind:style="style"> <div class='user-info'> <img :src="user.profile_image_url"> - <div v-if='user.muted' class='muteinfo'>Muted</div> - <div class='muteinfo' v-if='isOtherUser'> - <button @click="toggleMute">Mute/Unmute</button> - </div> <span class="glyphicon glyphicon-user"></span> <div class='user-name'>{{user.name}}</div> <div class='user-screen-name'>@{{user.screen_name}}</div> - <div v-if="isOtherUser" class="following-info"> - <div v-if="user.follows_you" class="following"> + <div v-if="isOtherUser" class="user-interactions"> + <div v-if="user.follows_you" class="following base06"> Follows you! </div> - <div class="followed"> + <div class="follow"> <span v-if="user.following"> - Following them! - <button @click="unfollowUser"> - Unfollow! + <!--Following them!--> + <button @click="unfollowUser" class="base06 base01-background base06-border"> + Unfollow </button> </span> - <span v-if="!user.following" > - <button @click="followUser"> - Follow! + <span v-if="!user.following"> + <button @click="followUser" class="base01 base04-background base01-border"> + Follow </button> </span> </div> + <div class='mute' v-if='isOtherUser'> + <span v-if='user.muted'> + <button @click="toggleMute" class="base04 base01-background base06-border">Unmute</button> + </span> + <span v-if='!user.muted'> + <button @click="toggleMute" class="base01 base04-background base01-border">Mute</button> + </span> + </div> </div> </div> </div> |