From 592c1cfd780ea8d5e9523a9875be698501293dc8 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Tue, 21 Nov 2017 10:30:30 +0200
Subject: Fix padding at user card bottom, mismatching border-radii. Sneak in
 fixes for attachment previews.

---
 src/components/attachment/attachment.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/components/attachment/attachment.vue')

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 20d10cce..7a5923b4 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -82,9 +82,7 @@
           img.media-upload {
               margin-bottom: -2px;
               max-height: 300px;
-              width: 100%;
-              height: 100%;
-              flex: 1;
+              max-width: 100%;
           }
 
           .oembed {
-- 
cgit v1.2.3-70-g09d2


From 4e07b89bcfb821afb65d39eb389bcb0b4de697c8 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Tue, 21 Nov 2017 10:52:09 +0200
Subject: not so \!important after all

---
 src/components/attachment/attachment.vue             | 7 +++++++
 src/components/post_status_form/post_status_form.vue | 7 +------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/components/attachment/attachment.vue')

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 7a5923b4..57ff2625 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -34,6 +34,13 @@
       display: flex;
       flex-wrap: wrap;
       margin-right: -0.7em;
+
+      .attachment.media-upload-container {
+        flex: 0 0 auto;
+        max-height: 300px;
+        max-width: 100%;
+      }
+      
       .attachment {
           flex: 1 0 30%;
           margin: 0.5em 0.7em 0.6em 0.0em;
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index a0000654..19a00aeb 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -25,7 +25,7 @@
         <i class="icon-cancel" @click="clearError"></i>
       </div>
       <div class="attachments">
-        <div class="attachment base03-border media-upload-container" v-for="file in newStatus.files">
+        <div class="media-upload-container attachment base03-border" v-for="file in newStatus.files">
           <i class="fa icon-cancel" @click="removeMediaFile(file)"></i>
           <img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img>
           <video v-if="type(file) === 'video'" :src="file.image" controls></video>
@@ -40,11 +40,6 @@
 <script src="./post_status_form.js"></script>
 
 <style lang="scss">
-  .media-upload-container {
-    flex: 0 0 auto !important;
-    max-height: 300px;
-    max-width: 100%;
-  }
 
  .tribute-container {
    ul {
-- 
cgit v1.2.3-70-g09d2


From f99e872c3561f8a3ae5bf96de92c783ea5959355 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 19 Dec 2017 00:12:49 +0300
Subject: fix australian images

---
 src/components/attachment/attachment.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components/attachment/attachment.vue')

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 57ff2625..d6a51ffd 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -131,6 +131,7 @@
                   width: 100%;
                   height: 100%; /* If this isn't here, chrome will stretch the images */
                   max-height: 500px;
+                  image-orientation: from-image;
               }
           }
       }
-- 
cgit v1.2.3-70-g09d2

