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

Fix padding at user card bottom, mismatching border-radii. Sneak in fixes for attachment previews.

Browse source
This commit is contained in:
shpuld 2017-11-21 10:30:30 +02:00
parent f6b2f6eaee
commit 592c1cfd78
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/attachment/attachment.vue
View file

@ -82,9 +82,7 @@
img.media-upload { img.media-upload {
margin-bottom: -2px; margin-bottom: -2px;
max-height: 300px; max-height: 300px;
width: 100%; max-width: 100%;
height: 100%;
flex: 1;
} }
.oembed { .oembed {

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

@ -25,7 +25,7 @@
<i class="icon-cancel" @click="clearError"></i> <i class="icon-cancel" @click="clearError"></i>
</div> </div>
<div class="attachments"> <div class="attachments">
<div class="attachment base03-border" v-for="file in newStatus.files"> <div class="attachment base03-border media-upload-container" v-for="file in newStatus.files">
<i class="fa icon-cancel" @click="removeMediaFile(file)"></i> <i class="fa icon-cancel" @click="removeMediaFile(file)"></i>
<img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img> <img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img>
<video v-if="type(file) === 'video'" :src="file.image" controls></video> <video v-if="type(file) === 'video'" :src="file.image" controls></video>
@ -40,6 +40,12 @@
<script src="./post_status_form.js"></script> <script src="./post_status_form.js"></script>
<style lang="scss"> <style lang="scss">
.media-upload-container {
flex: 0 0 auto !important;
max-height: 300px;
max-width: 100%;
}
.tribute-container { .tribute-container {
ul { ul {
padding: 0px; padding: 0px;

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

@ -63,9 +63,14 @@
width: -moz-webkit-fill-available; width: -moz-webkit-fill-available;
stretch: fill; stretch: fill;
margin: 0.2em 0 0.7em 0; margin: 0.2em 0 0.7em 0;
border-radius: 5px; border-radius: 10px;
border-style: solid; border-style: solid;
border-color: inherit; border-color: inherit;
border-width: 1px; border-width: 1px;
overflow: hidden;
p {
margin-bottom: 0;
}
} }
</style> </style>

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

@ -102,7 +102,6 @@
.profile-panel-body { .profile-panel-body {
top: -0em; top: -0em;
padding-top: 4em; padding-top: 4em;
word-wrap: break-word; word-wrap: break-word;
} }