From bac092d953eb661bcbcc06b734c509e68f939818 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Mon, 13 Nov 2017 11:08:34 +0200
Subject: [PATCH] Make oembeds behave properly, hide empty html attachments,
hide overflowing timeline background.
---
src/App.scss | 3 ++-
src/components/attachment/attachment.js | 8 ++------
src/components/attachment/attachment.vue | 5 +++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/App.scss b/src/App.scss
index 944c32b6..f10c3d65 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -128,12 +128,13 @@ main-router {
border-radius: 10px;
box-shadow: 1px 1px 3px rgba(0,0,0,.5);
+ overflow: hidden;
}
.panel-body:empty::before {
content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations
display: block;
- margin: 20px;
+ margin: 1em;
text-align: center;
}
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index ccf26b79..de551611 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -23,12 +23,8 @@ const Attachment = {
hidden () {
return this.nsfw && this.hideNsfwLocal && !this.showHidden
},
- autoHeight () {
- if (this.type === 'image' && this.nsfw) {
- return {
- 'min-height': '109px'
- }
- }
+ isEmpty () {
+ return this.type === 'html' && !this.attachment.oembed
}
},
methods: {
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index d4985732..954c46b4 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -1,5 +1,5 @@
<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()">
<img :key="nsfwImage" :src="nsfwImage"/>
</a>
@@ -50,7 +50,8 @@
}
&.html {
- flex-basis: 100%;
+ flex-basis: 90%;
+ width: 100%;
display: flex;
}