Merge branch 'release-3.5'

webapp/sass/components/_modal.scss

@@ -125,6 +125,7 @@
         }
 
         .modal-dialog {
+            margin-bottom: 0;
             margin-left: auto;
             margin-right: auto;
             max-width: 95%;
@@ -237,19 +238,6 @@
             top: 0;
         }
 
-        &.more-channel__modal {
-            .modal-body {
-                overflow-x: hidden;
-                padding: 10px 0 15px;
-            }
-
-            .channel-count {
-                @include opacity(.8);
-                float: right;
-                margin-top: 5px;
-            }
-        }
-
         .modal-image {
             height: 100%;
             margin: 0 auto;
@@ -449,9 +437,37 @@
                 }
             }
         }
+
+        &.more-channel__modal {
+            .modal-body {
+                overflow-x: hidden;
+                padding: 10px 0 15px;
+            }
+
+            .channel-count {
+                @include opacity(.8);
+                float: right;
+                margin-top: 5px;
+            }
+
+            .more-modal__list {
+                max-height: calc(100vh - 270px);
+            }
+        }
     }
 
     .more-modal {
+        .more-modal__list {
+            height: 100vh;
+            max-height: calc(100vh - 340px);
+        }
+
+        &.more-direct-channels {
+            .more-modal__list {
+                max-height: calc(100vh - 325px);
+            }
+        }
+
         .user-list {
             margin-top: 10px;
             overflow-x: hidden;