Merge branch 'release-3.7' into master.

2 files changed, 18 insertions, 5 deletions

diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index e6ab35f8a..1f8ea041e 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -51,6 +51,7 @@
 
     .hljs {
         position: relative;
+        visibility: visible;
     }
 }
 
@@ -163,11 +164,11 @@ code {
     }
 
     .hljs {
+        background: #f8f8f8;
+        color: #333;
         display: block;
         overflow-x: auto;
         padding: 0.5em;
-        color: #333;
-        background: #f8f8f8;
     }
 
     .container {
@@ -175,7 +176,7 @@ code {
     }
 
     .links {
-        margin-top: 30px;
         font-size: 1.2em;
+        margin-top: 30px;
     }
 }
\ No newline at end of file
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 8d14bfafc..1e1dd4b08 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -3,7 +3,7 @@
 .custom-textarea {
     background: transparent;
     border: 1px solid #cccccc;
-    height: auto;
+    height: 100%;
     line-height: 20px;
     min-height: 36px;
     overflow-x: hidden;
@@ -360,7 +360,10 @@
 
 .post-create__container {
     label {
-        font-weight: normal;
+       font-weight: normal;
+    }
+    .custom-textarea {
+        overflow: hidden;
     }
 
     form {
@@ -380,6 +383,8 @@
             }
 
             .custom-textarea {
+                -ms-overflow-style: auto;
+                overflow: auto;
                 padding-right: 43px;
             }
         }
@@ -581,6 +586,12 @@
             }
         }
 
+        &.post--system {
+            .status {
+                visibility: hidden;
+            }
+        }
+
         .post__img {
             padding-top: 0;
         }
@@ -588,6 +599,7 @@
         .status-wrapper {
             cursor: auto;
             height: 14px;
+            pointer-events: none;
 
             .status {
                 bottom: auto;