Merge branch 'fix/css-fixes-attachments-timeline-bottom' into 'develop'
CSS fixes Closes #39 See merge request pleroma/pleroma-fe!154
This commit is contained in:
commit
c3b401167d
|
@ -128,12 +128,13 @@ main-router {
|
||||||
|
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
box-shadow: 1px 1px 3px rgba(0,0,0,.5);
|
box-shadow: 1px 1px 3px rgba(0,0,0,.5);
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel-body:empty::before {
|
.panel-body:empty::before {
|
||||||
content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations
|
content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations
|
||||||
display: block;
|
display: block;
|
||||||
margin: 20px;
|
margin: 1em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,12 +23,8 @@ const Attachment = {
|
||||||
hidden () {
|
hidden () {
|
||||||
return this.nsfw && this.hideNsfwLocal && !this.showHidden
|
return this.nsfw && this.hideNsfwLocal && !this.showHidden
|
||||||
},
|
},
|
||||||
autoHeight () {
|
isEmpty () {
|
||||||
if (this.type === 'image' && this.nsfw) {
|
return this.type === 'html' && !this.attachment.oembed
|
||||||
return {
|
|
||||||
'min-height': '109px'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="attachment base03-border" :class="{[type]: true, loading}" :style="autoHeight">
|
<div class="attachment base03-border" :class="{[type]: true, loading}" v-show="!isEmpty">
|
||||||
<a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()">
|
<a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()">
|
||||||
<img :key="nsfwImage" :src="nsfwImage"/>
|
<img :key="nsfwImage" :src="nsfwImage"/>
|
||||||
</a>
|
</a>
|
||||||
|
@ -50,7 +50,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
&.html {
|
&.html {
|
||||||
flex-basis: 100%;
|
flex-basis: 90%;
|
||||||
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue