Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe

1 files changed, 46 insertions, 1 deletions

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index d20b704b..7feab42c 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -4,7 +4,7 @@
       <img :src="nsfwImage"></img>
     </a>
 
-    <a v-if="type === 'image' && !nsfw" :href="attachment.url" target="_blank"><img :src="attachment.url"></img></a>
+    <a class="image-attachment" v-if="type === 'image' && !nsfw" :href="attachment.url" target="_blank"><img :src="attachment.url"></img></a>
 
     <video v-if="type === 'webm' && !nsfw" :src="attachment.url" controls></video>
 
@@ -29,5 +29,50 @@
      video {
          height: 100%;
      }
+
+     .oembed {
+         img {
+             width: 100%;
+             height: 100%;
+         }
+     }
+
+    .oembed {
+        border: 1px solid rgba(0, 0, 0, 0.14);
+        width: 100%;
+
+        display: flex;
+        .image {
+            flex: 1;
+            img {
+                border: 0px;
+                border-radius: 0;
+            }
+        }
+
+        .text {
+            flex: 2;
+            margin: 8px;
+            h1 {
+                font-size: 14px;
+                margin: 0px;
+
+                a {
+                    color: black;
+                }
+            }
+        }
+    }
+
+     a.image-attachment {
+         display: flex;
+         flex: 1;
+
+         img {
+             width: 100%;
+             height: 100%;
+             flex: 1;
+         }
+     }
  }
 </style>