Merge branch 'release-3.9' into merge-3.9

5 files changed, 26 insertions, 3 deletions

diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 5e4abcb0e..e4325c149 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -5,7 +5,9 @@
     border-left: none;
     font-size: 14px;
     line-height: 56px;
+    position: relative;
     width: 100%;
+    z-index: 5;
 
     .member-popover__trigger,
     .pinned-posts-button {
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index 6fcbc7ff3..7cc79dba8 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -31,6 +31,12 @@ h6 {
     font-weight: 700;
     line-height: 1.5;
     margin: 10px 0;
+
+    .emoticon {
+        min-height: 1.5em;
+        min-width: 1.5em;
+        vertical-align: top;
+    }
 }
 
 .markdown__paragraph-inline {
diff --git a/webapp/sass/layout/_navigation.scss b/webapp/sass/layout/_navigation.scss
index 891ed6259..30d5264af 100644
--- a/webapp/sass/layout/_navigation.scss
+++ b/webapp/sass/layout/_navigation.scss
@@ -41,6 +41,14 @@
             width: 43px;
             z-index: 5;
 
+            > span {
+                > svg {
+                    position: relative;
+                    top: 13px;
+                    vertical-align: top;
+                }
+            }
+
             .icon-bar {
                 background: $white;
                 width: 21px;
@@ -49,7 +57,8 @@
             .icon-search {
                 font-size: 17px;
                 position: relative;
-                top: -2px;
+                top: 11px;
+                vertical-align: top;
             }
 
             .icon--white {
@@ -93,7 +102,7 @@
             .description {
                 color: $white;
                 display: inline-block;
-                margin-right: .5em;
+                margin-right: 1em;
 
                 &.info-popover {
                     @include background-size(100% 100%);
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 4985e3cba..2b84d01f9 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -651,6 +651,12 @@
             visibility: visible;
         }
 
+        .post__header {
+            .col__reply {
+                z-index: 7;
+            }
+        }
+
         .post__body {
             background: transparent !important;
         }
diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss
index 7065871e3..9a6f2be41 100644
--- a/webapp/sass/layout/_sidebar-right.scss
+++ b/webapp/sass/layout/_sidebar-right.scss
@@ -8,7 +8,7 @@
     position: fixed;
     right: 0;
     width: 400px;
-    z-index: 6;
+    z-index: 8;
 
     &.webrtc {
         z-index: 5;