From 5ab7726c1ec72678e505b87335eb011f97a09b3c Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
Date: Mon, 1 May 2017 09:18:21 +0500
Subject: Multiple Ui fixes (#6272)

* PLT-6453 - Improving headings in the web app

* PLT-6414 - Fixing view members modal issue

* PLT-5863 - Fixing alignment in new channel menu

* PLT-6391 - Fixing code block overlay
---
 webapp/sass/components/_modal.scss  |  4 ++++
 webapp/sass/layout/_forms.scss      |  2 +-
 webapp/sass/layout/_headers.scss    |  6 ++++++
 webapp/sass/layout/_markdown.scss   | 25 +++++++++++++++++++++++++
 webapp/sass/layout/_post-right.scss |  1 +
 webapp/sass/layout/_post.scss       |  4 ++--
 webapp/sass/responsive/_mobile.scss |  9 +++++++++
 7 files changed, 48 insertions(+), 3 deletions(-)

(limited to 'webapp/sass')

diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index 7e5d0cd3d..6e54d60ff 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -275,6 +275,10 @@
                 overflow-y: visible;
             }
 
+            .post-code__container {
+                overflow: auto;
+            }
+
             .modal-image__wrapper {
                 @include border-radius(3px);
                 display: table-cell;
diff --git a/webapp/sass/layout/_forms.scss b/webapp/sass/layout/_forms.scss
index c5f00c813..fe847d1d6 100644
--- a/webapp/sass/layout/_forms.scss
+++ b/webapp/sass/layout/_forms.scss
@@ -71,7 +71,7 @@
 
     .form__label {
         &.control-label {
-            color: inherit;
+            color: inherit !important;
         }
     }
 
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 6796570b6..000a7819e 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -26,6 +26,12 @@
         display: inline;
     }
 
+    .member-popover__trigger {
+        & + div {
+            display: none;
+        }
+    }
+
     .member-popover__trigger {
         .fa {
             margin-left: 4px;
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index 65f50b789..6fcbc7ff3 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -1,11 +1,36 @@
 @charset 'UTF-8';
 
+h1 {
+    font-size: 28px;
+}
+
+h2 {
+    font-size: 25px;
+}
+
+h3 {
+    font-size: 22px;
+}
+
+h4 {
+    font-size: 19px;
+}
+
+h5 {
+    font-size: 15px;
+}
+
+h6 {
+    font-size: 1em;
+}
+
 .markdown__link {
 }
 
 .markdown__heading {
     font-weight: 700;
     line-height: 1.5;
+    margin: 10px 0;
 }
 
 .markdown__paragraph-inline {
diff --git a/webapp/sass/layout/_post-right.scss b/webapp/sass/layout/_post-right.scss
index 4125d88fc..48fc57629 100644
--- a/webapp/sass/layout/_post-right.scss
+++ b/webapp/sass/layout/_post-right.scss
@@ -33,6 +33,7 @@
             .col__reply {
                 background: transparent !important;
                 border: none !important;
+                right: 5px;
                 text-align: right;
                 top: 0;
             }
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 2766943af..4acf4dcf2 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -167,7 +167,7 @@
     text-align: center;
     top: 0;
     width: 100%;
-    z-index: 6;
+    z-index: 11;
 
     .overlay__indent {
         @include clearfix;
@@ -361,7 +361,7 @@
 .post-create__container {
     @include flex(0 0 auto);
     width: 100%;
-    z-index: 1000;
+    z-index: 9;
 
     label {
         font-weight: normal;
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index 96fb86843..45707913c 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -727,8 +727,17 @@
                             z-index: 5;
 
                             .modal-title {
+                                max-width: 100%;
+                                padding: 0 40px;
                                 text-align: center;
                                 width: 100%;
+
+                                > span {
+                                    display: block;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                    white-space: nowrap;
+                                }
                             }
                         }
 
-- 
cgit v1.2.3-1-g7c22