From 44b976886fc9c68426dafb1efd9d75c207ce4acf Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
Date: Fri, 11 Aug 2017 19:39:05 +0500
Subject: PLT-7323/PLT-7334 CSS fixes (#7155)

* PLT-7334 - Channel header cuts off list

* PLT-7323 - Fixing alignment for attachments

* PLT-7323 - Fixing close button for attachments

* Changed header description to use margin instead of padding
---
 webapp/sass/layout/_headers.scss  |  5 +++--
 webapp/sass/layout/_webhooks.scss | 12 +++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'webapp/sass')

diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 0a836eafd..3e0a51422 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -175,9 +175,10 @@
     }
 
     .channel-header__description {
-        height: 35px;
+        height: 19px;
+        margin-top: 3px;
+        margin-bottom: 13px;
         overflow: hidden;
-        padding: 3px 0 0;
         position: relative;
         text-overflow: ellipsis;
         width: calc(100% - 18px);
diff --git a/webapp/sass/layout/_webhooks.scss b/webapp/sass/layout/_webhooks.scss
index edb4cbd93..15572ce85 100644
--- a/webapp/sass/layout/_webhooks.scss
+++ b/webapp/sass/layout/_webhooks.scss
@@ -37,6 +37,16 @@
 }
 
 .post {
+    &.post--comment {
+        .attachment {
+            .attachment__body__wrap {
+                .btn-close {
+                    left: -11px;
+                }
+            }
+        }
+    }
+
     .attachment {
         margin-left: -20px;
         position: relative;
@@ -64,7 +74,7 @@
         .attachment__thumb-pretext {
             background: transparent;
             border: none;
-            margin-left: 5px;
+            margin-left: 25px;
         }
 
         .attachment__container {
-- 
cgit v1.2.3-1-g7c22


From 1a270744a76f2e027b1ee630617d629001043a20 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 15 Aug 2017 08:28:28 -0400
Subject: PLT-7398 Removed flex-basis from search box (#7204)

---
 webapp/sass/components/_search.scss | 2 --
 1 file changed, 2 deletions(-)

(limited to 'webapp/sass')

diff --git a/webapp/sass/components/_search.scss b/webapp/sass/components/_search.scss
index 1c3200a71..6213d9c43 100644
--- a/webapp/sass/components/_search.scss
+++ b/webapp/sass/components/_search.scss
@@ -1,8 +1,6 @@
 @charset 'UTF-8';
 
 .search-bar__container {
-    @include flex(0 0 79px);
-
     .channel-header__links {
         .sidebar--right & {
             line-height: 25px;
-- 
cgit v1.2.3-1-g7c22