desea/akkoma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/css-fixes-attachments-timeline-bottom' into 'develop'

Browse source 
CSS fixes

Closes #39

See merge request pleroma/pleroma-fe!154
This commit is contained in:
lambda 2017-11-13 09:34:16 +00:00
commit c3b401167d
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/App.scss
View file

@ -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;
} }

8
src/components/attachment/attachment.js
View file

@ -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: {

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

@ -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;
} }