3 files changed, 71 insertions, 34 deletions
diff --git a/src/components/link-preview/link-preview.js b/src/components/link-preview/link-preview.js
index 13264afb..2f6da55e 100644
--- a/src/components/link-preview/link-preview.js
+++ b/src/components/link-preview/link-preview.js
@@ -1,8 +1,21 @@
 const LinkPreview = {
   name: 'LinkPreview',
   props: [
-    'card'
-  ]
+    'card',
+    'size',
+    'nsfw'
+  ],
+  computed: {
+    useImage () {
+      // Currently BE shoudn't give cards if tagged NSFW, this is a bit paranoid
+      // as it makes sure to hide the image if somehow NSFW tagged preview can
+      // exist.
+      return this.card.image && !this.nsfw && this.size !== 'hide'
+    },
+    useDescription () {
+      return this.card.description && /\S/.test(this.card.description)
+    }
+  }
 }
 
 export default LinkPreview
diff --git a/src/components/link-preview/link-preview.vue b/src/components/link-preview/link-preview.vue
index 49de654f..9b3f2550 100644
--- a/src/components/link-preview/link-preview.vue
+++ b/src/components/link-preview/link-preview.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
     <a class="link-preview-card" :href="card.url" target="_blank" rel="noopener">
-      <div class="image">
-        <div :style="{ backgroundImage: 'url(' + card.image + ')' }"></div>
+      <div class="card-image" :class="{ 'small-image': size === 'small' }" v-if="useImage">
+        <img :src="card.image"></img>
       </div>
-      <div class="content">
-        <strong>{{ card.title }}</strong>
-        <p>{{ card.description }}</p>
-        <span class="host">{{ card.provider_name }}</span>
+      <div class="card-content">
+        <span class="card-host faint">{{ card.provider_name }}</span>
+        <h4 class="card-title">{{ card.title }}</h4>
+        <p class="card-description" v-if="useDescription">{{ card.description }}</p>
       </div>
     </a>
   </div>
@@ -19,36 +19,56 @@
 @import '../../_variables.scss';
 
 .link-preview-card {
-  display: flex !important;
+  display: flex;
   flex-direction: row;
   cursor: pointer;
-  margin: 0.5em 0.7em 0.6em 0.0em;
+  overflow: hidden;
 
-  .image {
-    flex: 0 0 100px;
-    position: relative;
+  // TODO: clean up the random margins in attachments, this makes preview line
+  // up with attachments...
+  margin-right: 0.7em;
+
+  .card-image {
+    flex-shrink: 0;
+    width: 120px;
+    max-width: 25%;
+    img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      border-radius: $fallback--attachmentRadius;
+      border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
+    }
+  }
+
+  .small-image {
+    width: 80px;
   }
 
-  .image > div {
-    display: block;
-    margin: 0;
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-    background-size: cover;
-    background-position: center center;
+  .card-content {
+    max-height: 100%;
+    margin: 0.5em;
+    display: flex;
+    flex-direction: column;
   }
 
-  .content {
-    padding: 1em;
-    flex: 1;
+  .card-host {
+    font-size: 12px;
+  }
 
-    .host {
-      font-size: 90%;
-    }
+  .card-description {
+    margin: 0.5em 0 0 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-break: break-word;
+    line-height: 1.2em;
+    // cap description at 3 lines, the 1px is to clean up some stray pixels
+    // TODO: fancier fade-out at the bottom to show off that it's too long?
+    max-height: calc(1.2em * 3 - 1px);
   }
 
   color: $fallback--text;
+  color: var(--text, $fallback--text);
   border-style: solid;
   border-width: 1px;
   border-radius: $fallback--attachmentRadius;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index aa37ad51..d88428c7 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -98,8 +98,8 @@
             </attachment>
           </div>
 
-          <div v-if='status.card && !hideSubjectStatus && !noHeading' class='link-preview media-body'>
-            <link-preview :card="status.card"></link-preview>
+          <div v-if="status.card && !hideSubjectStatus && !noHeading" class="link-preview media-body">
+            <link-preview :card="status.card" :size="attachmentSize" :nsfw="nsfwClickthrough" />
           </div>
 
           <div v-if="!noHeading && !noReplyLinks" class='status-actions media-body'>
@@ -225,6 +225,11 @@
     vertical-align: bottom;
     flex-basis: 100%;
 
+    a {
+      display: inline-block;
+      word-break: break-all;
+    }
+
     small {
       font-weight: lighter;
     }
@@ -300,11 +305,6 @@
     }
   }
 
-  a {
-    display: inline-block;
-    word-break: break-all;
-  }
-
   .tall-status {
     position: relative;
     height: 220px;
@@ -313,6 +313,8 @@
   }
 
   .tall-status-hider {
+    display: inline-block;
+    word-break: break-all;
     position: absolute;
     height: 70px;
     margin-top: 150px;
@@ -330,6 +332,8 @@
   .status-unhider, .cw-status-hider {
     width: 100%;
     text-align: center;
+    display: inline-block;
+    word-break: break-all;
   }
 
   .status-content {