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

Merge branch 'fix/user-card-changes-and-fixes' into 'develop'

Browse source 
User card changes and fixes

See merge request !104
This commit is contained in:
lambadalambda 2017-08-22 06:13:10 -04:00
commit e5d0965ff1
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
<div id="heading" class="profile-panel-background" :style="headingStyle"> <div id="heading" class="profile-panel-background" :style="headingStyle">
<div class="panel-heading text-center"> <div class="panel-heading text-center">
<div class='user-info'> <div class='user-info'>
<router-link to='/user-settings' style="float: right;"> <router-link to='/user-settings' style="float: right;" v-if="!isOtherUser">
<i class="icon-cog usersettings"></i> <i class="icon-cog usersettings"></i>
</router-link> </router-link>
<div class='container'> <div class='container'>
@ -136,7 +136,7 @@
.user-info { .user-info {
color: white; color: white;
padding: 16px 16px 16px 16px; padding: 0 16px 16px 16px;
margin-bottom: -4em; margin-bottom: -4em;
.usersettings { .usersettings {
@ -145,21 +145,22 @@
} }
.container{ .container{
padding: 16px 10px 4px 10px;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
flex-direction: column; flex-direction: column;
align-content: flex-start; align-content: flex-start;
justify-content: center; justify-content: center;
max-height: 60px; max-height: 56px;
overflow: hidden; overflow: hidden;
} }
img { img {
border: 2px solid;
border-radius: 5px; border-radius: 5px;
flex: 1 0 100%; flex: 1 0 100%;
width: 48px; width: 56px;
height: 48px; height: 56px;
box-shadow: 0px 1px 8px rgba(0,0,0,0.75);
object-fit: cover; object-fit: cover;
} }
@ -167,7 +168,6 @@
.name-and-screen-name { .name-and-screen-name {
display: block; display: block;
margin-top: 0.0em;
margin-left: 0.6em; margin-left: 0.6em;
text-align: left; text-align: left;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -175,9 +175,11 @@
} }
.user-name{ .user-name{
color: white;
} }
.user-screen-name { .user-screen-name {
color: white;
font-weight: lighter; font-weight: lighter;
font-size: 15px; font-size: 15px;
padding-right: 0.1em; padding-right: 0.1em;
@ -215,14 +217,12 @@
} }
button { button {
border: solid;
border-width: 1px;
width: 92%; width: 92%;
height: 100%; height: 100%;
} }
.pressed { .pressed {
border: solid; border-bottom-color: rgba(255, 255, 255, 0.2);
border-width: 1px; border-top-color: rgba(0, 0, 0, 0.2);
} }
} }
} }