From dc6862079a7055269e8aa861caf0093e7be29e83 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
Date: Wed, 12 Jul 2017 18:48:35 +0500
Subject: Release 4.0 bug fixes (#6911)

* PLT-7098 - Back arrow cut off in sidebar

* PLT-7089 - Fixing channel name truncation
---
 webapp/sass/layout/_headers.scss       |  6 +++---
 webapp/sass/layout/_sidebar-right.scss |  7 ++++---
 webapp/sass/responsive/_desktop.scss   | 10 +++++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'webapp/sass')

diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 1ca81c880..5bebfcd4d 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -128,15 +128,15 @@
         white-space: nowrap;
 
         .move--left & {
-            max-width: calc(100vw - 830px);
+            max-width: calc(100vw - 850px);
 
             .multi-teams & {
-                max-width: calc(100vw - 880px);
+                max-width: calc(100vw - 905px);
             }
         }
 
         .multi-teams & {
-            max-width: calc(100vw - 830px);
+            max-width: calc(100vw - 850px);
         }
     }
 
diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss
index 907b14b6d..6d31c1606 100644
--- a/webapp/sass/layout/_sidebar-right.scss
+++ b/webapp/sass/layout/_sidebar-right.scss
@@ -128,7 +128,7 @@
         color: inherit;
         display: inline-block;
         font-size: 26px;
-        margin: 0 0 0 -14px;
+        margin-left: -14px;
         text-align: center;
         vertical-align: top;
         width: 30px;
@@ -209,6 +209,7 @@
 
     .sidebar--right__title {
         @include clearfix;
+        padding-left: 15px;
     }
 
     .sidebar--right__header {
@@ -219,13 +220,13 @@
         height: 44px;
         line-height: 44px;
         overflow: hidden;
-        padding: 0 5px 0 15px;
+        padding: 0 5px 0 0;
         text-transform: uppercase;
     }
 
     .sidebar--right__subheader {
         font-size: 1em;
-        padding: 0.5em 1em 0;
+        padding: .5em 1em 0;
 
         h4 {
             font-size: 1em;
diff --git a/webapp/sass/responsive/_desktop.scss b/webapp/sass/responsive/_desktop.scss
index 67ec9e3a7..184b57710 100644
--- a/webapp/sass/responsive/_desktop.scss
+++ b/webapp/sass/responsive/_desktop.scss
@@ -91,7 +91,15 @@
             max-width: calc(100vw - 800px);
 
             .multi-teams & {
-                max-width: calc(100vw - 750px);
+                max-width: calc(100vw - 775px);
+            }
+        }
+    }
+
+    .channel-header__info {
+        .channel-header__description {
+            .multi-teams & {
+                max-width: calc(100vw - 730px);
             }
         }
     }
-- 
cgit v1.2.3-1-g7c22