Merge branch 'release-3.6'

webapp/sass/responsive/_mobile.scss

@@ -20,6 +20,12 @@
         }
     }
 
+    .settings-modal {
+        .modal-body {
+            overflow: auto;
+        }
+    }
+
     #header-popover {
         @include single-transition(all, .35s, ease);
         @include translate3d(0, 100%, 0);
@@ -347,10 +353,6 @@
                 }
 
                 .post__img {
-                    .status-wrapper {
-                        display: inline-block;
-                    }
-
                     img {
                         display: block;
                     }
@@ -430,8 +432,8 @@
     }
 
     .search-help-popover {
-        margin-left: 10px;
-        max-width: calc(100% - 20px);
+        left: 55px;
+        max-width: calc(100% - 80px);
     }
 
     .modal-direct-channels,
@@ -1088,7 +1090,7 @@
                 .post-error {
                     top: 0;
                     left: 0;
-              }
+                }
             }
         }
 
@@ -1217,6 +1219,16 @@
 }
 
 @media screen and (max-width: 640px) {
+    .filtered-user-list {
+        height: calc(100vh - 80px);
+    }
+
+    .more-modal--action {
+        .filtered-user-list {
+            height: calc(100vh - 110px);
+        }
+    }
+
     .app__body {
         .modal {
             .more-modal {
@@ -1224,10 +1236,6 @@
                     max-height: calc(100vh - 62px);
                     padding-bottom: 5px;
                 }
-
-                .more-modal__list {
-                    max-height: calc(100vh - 230px);
-                }
             }
         }
 
@@ -1388,15 +1396,14 @@
 @media screen and (max-width: 550px) {
     .app__body {
         .more-modal {
-            .filter-row {
-                width: 100%;
+            &.more-system-members {
+                .filter-row {
+                    min-height: 80px;
+                    width: 100%;
+                }
             }
 
             &.more-direct-channels {
-                .filter-row {
-                    padding-bottom: 50px;
-                }
-
                 .member-show {
                     display: none;
                 }
@@ -1454,16 +1461,6 @@
 
     .app__body {
         .modal {
-            &.more-channel__modal {
-                .more-modal__list {
-                    max-height: calc(100vh - 250px);
-                }
-
-                .modal-body {
-                    padding-bottom: 35px;
-                }
-            }
-
             .settings-modal {
                 &.display--content {
                     .modal-body {