Correct messaging and sidebar border; remove old border positioning hack

laCour · Sep 15, 2017 · 1dd43f9 · 1dd43f9
1 parent db6e153
commit 1dd43f9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -2,13 +2,18 @@
   background: $color-base;
 }
 
+#col_messages {
+  box-shadow: inset 1px 0 0 0 $color-base;
+}
+
 ts-message {
   color: $base-font-color;
 
   &.active:not(.standalone):not(.multi_delete_mode):not(.highlight):not(.new_reply),
   &.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) {