Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict.

Browse source
This commit is contained in:
Shpuld Shpuldson 2017-08-23 20:33:20 +03:00
parent 2bc261afba
commit bf61592b56
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/timeline/timeline.vue
View file

@ -89,14 +89,6 @@
} }
} }
.avatar {
padding-top: 0.3em;
width:32px;
height: 32px;
border-radius: 50%;
}
.new-status-notification { .new-status-notification {
position:relative; position:relative;
margin-top: -1px; margin-top: -1px;

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

@ -7,14 +7,14 @@
<user-card-content :user="user" :switcher="false"></user-card-content> <user-card-content :user="user" :switcher="false"></user-card-content>
</div> </div>
<div class="name-and-screen-name" v-else> <div class="name-and-screen-name" v-else>
<div class="user-name">{{ user.name }}</div> <div class="user-name">
<a href="user.statusnet_profile_url"><div class="user-screen-name">@{{ user.screen_name }}</div></a> {{ user.name }}
</div> <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
<span class="follows-you" v-if="!userExpanded && showFollows"> Follows you!
<div class="follows" v-if="user.follows_you"> </span>
Follows you!
</div> </div>
</span> <a :href="user.statusnet_profile_url" target="blank"><div class="user-screen-name">@{{ user.screen_name }}</div></a>
</div>
</div> </div>
</template> </template>
@ -23,21 +23,19 @@
<style lang="scss"> <style lang="scss">
.name-and-screen-name { .name-and-screen-name {
margin-left: 0.7em; margin-left: 0.7em;
min-width: 16em;
display:block;
margin-top:0.0em; margin-top:0.0em;
margin-right: 2em; margin-right: 2em;
text-align: left; text-align: left;
width: 100%;
} }
.follows-you { .follows-you {
margin-left: 2em; margin-left: 2em;
width:-webkit-fill-available; float: right;
width: -moz-webkit-fill-available;
} }
.follows { .follows {
float: right;
} }
.card { .card {
@ -50,6 +48,14 @@
border-bottom: 1px solid; border-bottom: 1px solid;
margin: 0; margin: 0;
border-bottom-color: inherit; border-bottom-color: inherit;
.avatar {
margin-top: 0.2em;
width:32px;
height: 32px;
border-radius: 50%;
}
} }
.usercard { .usercard {

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

@ -14,6 +14,8 @@
.user-profile { .user-profile {
flex: 2; flex: 2;
flex-basis: 500px; flex-basis: 500px;
padding-bottom: 10px;
border-radius: 10px;
} }
</style> </style>