From 1dd43f99338545f5e9aa92ee4b148ecc6d4cded3 Mon Sep 17 00:00:00 2001
From: Jonathan la Cour <jon@lacour.me>
Date: Thu, 14 Sep 2017 22:52:21 -0600
Subject: [PATCH] Correct messaging and sidebar border; remove old border
 positioning hack

---
 scss/modules/_hacks.scss            | 4 ----
 scss/modules/header/_base.scss      | 2 ++
 scss/modules/inputs/_messaging.scss | 1 +
 scss/modules/messaging/_base.scss   | 5 +++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scss/modules/_hacks.scss b/scss/modules/_hacks.scss
index 59f17955..0facadbe 100644
--- a/scss/modules/_hacks.scss
+++ b/scss/modules/_hacks.scss
@@ -1,7 +1,3 @@
-#msgs_scroller_div {
-  margin-left: 4px; // This is necessary because this container is being undersized on the width property by a script. Without this, there would be a 4px space on the right, to the left of the monkey scroller.
-}
-
 .monkey_scroll_bar {
   z-index: 99; // This should have a higher z-index than messages and dividers or else they overlap.
 }
diff --git a/scss/modules/header/_base.scss b/scss/modules/header/_base.scss
index 7568cd97..9a564d7f 100644
--- a/scss/modules/header/_base.scss
+++ b/scss/modules/header/_base.scss
@@ -1,5 +1,6 @@
 .channel_header {
   background: $color-base;
+  box-shadow: inset 1px 0 0 0 $color-base;
 
   .blue_on_hover:hover {
     color: $base-font-color;
@@ -9,6 +10,7 @@
 #client_body:not(.onboarding)::before {
   background: $color-base;
   border-bottom: 1px solid $color-shade-dark;
+  box-shadow: inset 1px 0 0 0 $color-base;
 }
 
 .messages_header {
diff --git a/scss/modules/inputs/_messaging.scss b/scss/modules/inputs/_messaging.scss
index bb16e339..d6c5c66c 100644
--- a/scss/modules/inputs/_messaging.scss
+++ b/scss/modules/inputs/_messaging.scss
@@ -112,6 +112,7 @@
 
 #footer {
   background: $color-base;
+  box-shadow: inset 1px 0 0 0 $color-base;
 
   &.disabled #message-input,
   &.disabled #msg_input {
diff --git a/scss/modules/messaging/_base.scss b/scss/modules/messaging/_base.scss
index fa8587ef..ccf50d41 100644
--- a/scss/modules/messaging/_base.scss
+++ b/scss/modules/messaging/_base.scss
@@ -2,6 +2,10 @@
   background: $color-base;
 }
 
+#col_messages {
+  box-shadow: inset 1px 0 0 0 $color-base;
+}
+
 ts-message {
   color: $base-font-color;
 
@@ -9,6 +13,7 @@ ts-message {
   &.message--focus:not(.standalone):not(.multi_delete_mode):not(.highlight):not(.new_reply),
   &:hover:not(.standalone):not(.multi_delete_mode):not(.highlight):not(.new_reply) {
     background: rgba($color-shade-darkest, 0.1);
+    box-shadow: inset 1px 0 0 0 $color-base;
 
     &.is_pinned,
     &.show_recap:not(.is_pinned) {