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

not so \!important after all

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

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

@ -34,6 +34,13 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-right: -0.7em; margin-right: -0.7em;
.attachment.media-upload-container {
flex: 0 0 auto;
max-height: 300px;
max-width: 100%;
}
.attachment { .attachment {
flex: 1 0 30%; flex: 1 0 30%;
margin: 0.5em 0.7em 0.6em 0.0em; margin: 0.5em 0.7em 0.6em 0.0em;

7
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 media-upload-container" v-for="file in newStatus.files"> <div class="media-upload-container attachment base03-border" 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,11 +40,6 @@
<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 {