subtype/akkoma-fe
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'develop'

Browse source 
Make user card look neater

See merge request !16
This commit is contained in:
lambadalambda 2017-02-18 11:27:54 -05:00
parent 4e366f27a1 15c82dea62
commit 44b6a90fc5
2 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/components/user_card_content/user_card_content.vue
View file

@ -3,30 +3,34 @@
<div class="base00-background panel-heading text-center" v-bind:style="style"> <div class="base00-background panel-heading text-center" v-bind:style="style">
<div class='user-info'> <div class='user-info'>
<img :src="user.profile_image_url"> <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> <span class="glyphicon glyphicon-user"></span>
<div class='user-name'>{{user.name}}</div> <div class='user-name'>{{user.name}}</div>
<div class='user-screen-name'>@{{user.screen_name}}</div> <div class='user-screen-name'>@{{user.screen_name}}</div>
<div v-if="isOtherUser" class="following-info"> <div v-if="isOtherUser" class="user-interactions">
<div v-if="user.follows_you" class="following"> <div v-if="user.follows_you" class="following base06">
Follows you! Follows you!
</div> </div>
<div class="followed"> <div class="follow">
<span v-if="user.following"> <span v-if="user.following">
Following them! <!--Following them!-->
<button @click="unfollowUser"> <button @click="unfollowUser" class="base06 base01-background base06-border">
Unfollow! Unfollow
</button> </button>
</span> </span>
<span v-if="!user.following" > <span v-if="!user.following">
<button @click="followUser"> <button @click="followUser" class="base01 base04-background base01-border">
Follow! Follow
</button> </button>
</span> </span>
</div> </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> </div>
</div> </div>

28
src/components/user_profile/user_profile.vue
View file

@ -13,17 +13,35 @@
} }
.user-info { .user-info {
.following-info { .user-interactions {
display: flex; display: flex;
flex-flow: row wrap;
div { div {
flex: 1; flex: 1;
} }
margin-top: 1em; margin-top: 0.5em;
margin-bottom: -1.2em; margin-bottom: -1.2em;
}
.muteinfo{ .following {
margin: 0.5em 0; font-size: 14px;
flex: 0 0 100%;
margin-bottom: 0.5em;
}
.mute {
margin-right: 4em;
}
.follow {
margin-left: 4em;
}
button {
width: 80%;
height: 100%;
border: 1px solid;
}
} }
.user-screen-name { .user-screen-name {
margin-top: 0.4em; margin-top: 0.4em;