therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing

Browse source
This commit is contained in:
Shpuld Shpuldson 2017-08-16 00:15:00 +03:00
commit c4920f2d86
23 changed files with 111 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,8 +8,10 @@
<div class='container'>
<img :src="user.profile_image_url">
<span class="glyphicon glyphicon-user"></span>
<div class='user-name'>{{user.name}}</div>
<div class='user-screen-name'>@{{user.screen_name}}</div>
<div class="name-and-screen-name">
<div class='user-name'>{{user.name}}</div>
<div class='user-screen-name'>@{{user.screen_name}}</div>
</div>
</div>
<div v-if="isOtherUser" class="user-interactions">
<div v-if="user.follows_you && loggedIn" class="following base06">
@ -124,6 +126,8 @@
.profile-panel-body {
top: -0em;
padding-top: 4em;
word-wrap: break-word;
}
.user-info {
@ -143,33 +147,37 @@
align-content: flex-start;
justify-content: center;
max-height: 60px;
overflow: hidden;
}
img {
border: 2px solid;
border-radius: 5px;
flex: 1 0 100%;
max-width: 48px;
max-height: 48px;
border: 2px solid;
border-radius: 5px;
flex: 1 0 100%;
width: 48px;
height: 48px;
object-fit: cover;
}
text-shadow: 0px 1px 1.5px rgba(0, 0, 0, 1.0);
.user-name{
margin-top: 0.0em;
.name-and-screen-name {
display: block;
margin-top: 0.0em;
margin-left: 0.6em;
flex: 0 0 auto;
align-self: flex-start;
text-align: left;
text-overflow: ellipsis;
white-space: nowrap;
}
.user-name{
}
.user-screen-name {
margin-top: 0.0em;
margin-left: 0.6em;
font-weight: lighter;
font-size: 15px;
padding-right: 0.1em;
flex: 0 0 auto;
align-self: flex-start;
}
.user-interactions {