Anon/yandere_fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/style-fixes-again' into 'develop'

Browse Source 
More style fixes

See merge request pleroma/pleroma-fe!167
This commit is contained in:
lambda 2017-11-20 11:51:52 +00:00
commit 6ac8a43e28
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/App.scss
View File

@ -127,7 +127,7 @@ main-router {
margin: 0.5em; margin: 0.5em;
border-radius: 10px; border-radius: 10px;
box-shadow: 1px 1px 3px rgba(0,0,0,.5); box-shadow: 1px 1px 4px rgba(0,0,0,.6);
overflow: hidden; overflow: hidden;
} }
@ -160,8 +160,8 @@ main-router {
#content { #content {
margin: auto; margin: auto;
min-height: 100vh;
max-width: 980px; max-width: 980px;
border-radius: 10px;
padding-bottom: 1em; padding-bottom: 1em;
background-color: rgba(0,0,0,0.1); background-color: rgba(0,0,0,0.1);
} }
@ -176,6 +176,7 @@ main-router {
nav { nav {
z-index: 1000; z-index: 1000;
box-shadow: 0px 0px 4px rgba(0,0,0,.6);
} }
.fade-enter-active, .fade-leave-active { .fade-enter-active, .fade-leave-active {

12
src/components/status/status.vue
View File

@ -39,7 +39,7 @@
</a> </a>
</div> </div>
<div class="media-body"> <div class="media-body">
<div class="base05 base05=border usercard" v-if="userExpanded"> <div class="base03-border usercard" v-if="userExpanded">
<user-card-content :user="status.user" :switcher="false"></user-card-content> <user-card-content :user="status.user" :switcher="false"></user-card-content>
</div> </div>
<div class="user-content"> <div class="user-content">
@ -244,7 +244,7 @@
max-height: 400px; max-height: 400px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
img, video { img, video {
max-width: 100%; max-width: 100%;
max-height: 400px; max-height: 400px;
@ -383,14 +383,6 @@
margin-left: auto; margin-left: auto;
} }
.usercard {
border-style: solid;
border-width: 1px;
border-radius: 10px;
margin-bottom: 1em;
margin-top: 0.2em;
}
.reply-left { .reply-left {
flex: 0; flex: 0;
min-width: 48px; min-width: 48px;

10
src/components/user_card/user_card.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<div class="card base00-background base03-border"> <div class="card base00-background">
<a href="#"> <a href="#">
<img @click.prevent="toggleUserExpanded" class="avatar" :src="user.profile_image_url"> <img @click.prevent="toggleUserExpanded" class="avatar" :src="user.profile_image_url">
</a> </a>
<div class="base05 base05=border usercard" v-if="userExpanded"> <div class="usercard" v-if="userExpanded">
<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>
@ -62,6 +62,10 @@
width: -webkit-fill-available; width: -webkit-fill-available;
width: -moz-webkit-fill-available; width: -moz-webkit-fill-available;
stretch: fill; stretch: fill;
margin-left: 0.7em; margin: 0.2em 0 0.7em 0;
border-radius: 5px;
border-style: solid;
border-color: inherit;
border-width: 1px;
} }
</style> </style>

5
src/components/user_panel/user_panel.vue
View File

@ -1,12 +1,9 @@
<template> <template>
<div class="user-panel"> <div class="user-panel">
<div v-if='user' class="panel panel-default"> <div v-if='user' class="panel panel-default" style="overflow: visible;">
<user-card-content :user="user" :switcher="false"></user-card-content> <user-card-content :user="user" :switcher="false"></user-card-content>
<div class="panel-footer base00-background"> <div class="panel-footer base00-background">
<post-status-form v-if='user'></post-status-form> <post-status-form v-if='user'></post-status-form>
</div> </div>
</div> </div>
<login-form v-if='!user'></login-form> <login-form v-if='!user'></login-form>