From a88f283ef742cbeb1bfc198b0cf76c051f2834e6 Mon Sep 17 00:00:00 2001
From: Matthew Birtch <mattbirtch@gmail.com>
Date: Thu, 13 Jun 2024 14:11:30 -0400
Subject: [PATCH] MM-58685 Fix Channel Header Icon Button Spacing (#27313)

Automatic Merge
---
 webapp/channels/src/sass/components/_buttons.scss | 2 +-
 webapp/channels/src/sass/components/_modal.scss   | 4 ++++
 webapp/channels/src/sass/layout/_headers.scss     | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/webapp/channels/src/sass/components/_buttons.scss b/webapp/channels/src/sass/components/_buttons.scss
index 43d1f6d5a2..705ff8a2a9 100644
--- a/webapp/channels/src/sass/components/_buttons.scss
+++ b/webapp/channels/src/sass/components/_buttons.scss
@@ -133,7 +133,7 @@ button {
     }
 
     & + .btn {
-        margin-left: 8px !important;
+        margin-left: 8px;
     }
 
     &.btn-full {
diff --git a/webapp/channels/src/sass/components/_modal.scss b/webapp/channels/src/sass/components/_modal.scss
index 671489859e..fee3ed5e1b 100644
--- a/webapp/channels/src/sass/components/_modal.scss
+++ b/webapp/channels/src/sass/components/_modal.scss
@@ -165,6 +165,10 @@
             font-weight: bold;
             text-align: left;
         }
+
+        & .btn + .btn {
+            margin-left: 8px;
+        }
     }
 
     &.modal-image {
diff --git a/webapp/channels/src/sass/layout/_headers.scss b/webapp/channels/src/sass/layout/_headers.scss
index bb768e09b6..fea948e405 100644
--- a/webapp/channels/src/sass/layout/_headers.scss
+++ b/webapp/channels/src/sass/layout/_headers.scss
@@ -361,6 +361,10 @@
         display: flex;
         margin-right: 8px;
         gap: 4px;
+
+        .btn-icon {
+            margin: 0;
+        }
     }
 
     .channel-header__description {