Merge branch 'release-3.7' into master.

6 files changed, 31 insertions, 8 deletions

diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index 3698e8dc9..bfc082ad3 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -566,7 +566,7 @@
     .more-modal__actions {
         flex-grow: 0;
         flex-shrink: 0;
-        margin: 5px 0 10px;
+        margin: 5px 0;
         padding-left: 20px;
     }
 
diff --git a/webapp/sass/components/_multi-select.scss b/webapp/sass/components/_multi-select.scss
index a33116aa4..beceb7b9c 100644
--- a/webapp/sass/components/_multi-select.scss
+++ b/webapp/sass/components/_multi-select.scss
@@ -29,7 +29,6 @@
 
     .Select-value-label {
         overflow: hidden;
-        text-overflow: ellipsis;
     }
 }
 
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;
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index 66c288a48..4fbec082a 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -13,6 +13,7 @@
 
         .Select-value-label {
             max-width: 190px;
+            text-overflow: ellipsis;
         }
     }
 
@@ -555,6 +556,13 @@
         }
 
         .modal {
+            .modal--scroll {
+                .modal-body {
+                    max-height: calc(100vh - 62px);
+                    overflow: auto;
+                }
+            }
+
             .nav-pills {
                 > li {
                     &.active {
@@ -1628,6 +1636,7 @@
                 }
             }
         }
+
         .attachment {
             .attachment__image {
                 &.attachment__image--openraph {
@@ -1641,6 +1650,7 @@
         left: 0;
         position: fixed;
         top: 0;
+        z-index: 9999;
 
         .tutorial__content {
             .tutorial__steps {
diff --git a/webapp/sass/routes/_signup.scss b/webapp/sass/routes/_signup.scss
index c73c32656..13ee95e76 100644
--- a/webapp/sass/routes/_signup.scss
+++ b/webapp/sass/routes/_signup.scss
@@ -450,6 +450,7 @@
     .signup-team-dir {
         background: #fafafa;
         border-top: 1px solid #d5d5d5;
+        overflow: hidden;
 
         &:first-child {
             border: none;
@@ -458,7 +459,7 @@
         .icon {
             cursor: pointer;
             float: left;
-            margin: 18px 7px 0 15px;
+            margin: 16px 7px 0 15px;
             opacity: .45;
 
             svg {