From 770410ee883e9d6b28c01046012b64a46e12470f Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Thu, 19 Apr 2018 11:37:26 -0700
Subject: [PATCH] Remove borders that didn't render well

Android: The gray border around the quote didn't interact well with the
image, which needed to overlap the border. For now we'll just remove the
border.

Also made the thumbnail image 2px bigger because I noticed that in some
cases there was a partial-pixel space below the image (where the rest of
the quote was making the container bigger).

iOS: The gray border around outgoing quotes was fading into the
background gray color, making the quote look a tiny bit more narrow than
the main message. Removed the border.
---
 stylesheets/_conversation.scss | 11 ++++-------
 stylesheets/_ios.scss          | 22 ++++++----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 2ece4aa95..d257a9e01 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -735,9 +735,6 @@ span.status {
   // Accent color border:
   border-left-width: 3px;
   border-left-style: solid;
-  border-top: 1px solid lightgray;
-  border-bottom: 1px solid lightgray;
-  border-right: 1px solid lightgray;
 
   .primary {
     flex-grow: 1;
@@ -805,9 +802,9 @@ span.status {
 
   .icon-container {
     flex: initial;
-    min-width: 48px;
-    width: 48px;
-    height: 48px;
+    min-width: 50px;
+    width: 50px;
+    height: 50px;
     position: relative;
 
     .circle-background {
@@ -853,7 +850,7 @@ span.status {
     .inner {
       position: relative;
 
-      height: 48px;
+      height: 50px;
       text-align: center;
       display: flex;
       align-items: center;
diff --git a/stylesheets/_ios.scss b/stylesheets/_ios.scss
index c5f398e0e..b12e01dd3 100644
--- a/stylesheets/_ios.scss
+++ b/stylesheets/_ios.scss
@@ -114,14 +114,10 @@ $ios-border-color: rgba(0,0,0,0.1);
   }
 
   .quoted-message {
-    border-top-left-radius: 15px;
-    border-top-right-radius: 15px;
-
     // Not ideal, but necessary to override the specificity of the android theme color
     //   classes used in conversations.scss
     background-color: white !important;
-    border: 1px solid $grey_l1_5 !important;
-    border-bottom: none !important;
+    border: none !important;
 
     margin-top: 0px !important;
     margin-bottom: 0px;
@@ -191,7 +187,7 @@ $ios-border-color: rgba(0,0,0,0.1);
       flex: initial;
       min-width: 32px;
       width: 32px;
-      height: 48px;
+      height: 50px;
       position: relative;
 
       top: auto;
@@ -224,8 +220,6 @@ $ios-border-color: rgba(0,0,0,0.1);
   }
 
   .incoming .quoted-message {
-    border-left: none;
-    border: none !important;
     border-bottom: 1px solid lightgray !important;
   }
 
@@ -253,11 +247,7 @@ $ios-border-color: rgba(0,0,0,0.1);
     }
 
     .quoted-message {
-      border-top-left-radius: 0px;
-      border-top-right-radius: 0px;
-
       background: none !important;
-      border: none !important;
 
       .primary {
         padding: 0px;
@@ -268,9 +258,9 @@ $ios-border-color: rgba(0,0,0,0.1);
       }
 
       .icon-container {
-        height: 48px;
-        width: 48px;
-        min-width: 48px;
+        height: 50px;
+        width: 50px;
+        min-width: 50px;
 
         .circle-background {
           left: 6px;
@@ -290,7 +280,7 @@ $ios-border-color: rgba(0,0,0,0.1);
 
         .inner {
           padding: 0px;
-          height: 48px;
+          height: 50px;
         }
       }
     }