From 5809c97828d1e8e586697059c9e561f4b35890f8 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 3 Dec 2019 11:08:35 +0100
Subject: [PATCH] Fixes #1666. Fixes #1792. Add scrollbars for modals

---
 CHANGES.md           |  2 ++
 sass/_chatrooms.scss | 12 ------------
 sass/_core.scss      | 14 --------------
 sass/_modal.scss     | 26 +++++++++++++++++++-------
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a58a2b3b5..8daf32992 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,8 +17,10 @@
 
 - #129: Add support for [XEP-0156: Disovering Alternative XMPP Connection Methods](https://xmpp.org/extensions/xep-0156.html). Only XML is supported for now.
 - #1105: Preliminary support for storing persistent data in IndexedDB instead of localStorage
+- #1666: Allow scrolling of the OMEMO fingerprints list
 - #1691: Fix `collection.chatbox is undefined` errors
 - #1772: `_converse.api.contact.add(jid, nick)` fails, says not a function
+- #1792: Fix: modals don't have scrollbars
 - #1796: Don't show "back" arrow navigation (on mobile) in the chat header when in `singleton` mode
 
 ### Breaking changes
diff --git a/sass/_chatrooms.scss b/sass/_chatrooms.scss
index c464af1c1..4ef78d6ae 100644
--- a/sass/_chatrooms.scss
+++ b/sass/_chatrooms.scss
@@ -1,6 +1,5 @@
 #conversejs.converse-embedded,
 #conversejs {
-
     .badge-room-color {
         background-color: var(--chatroom-head-color);
     }
@@ -12,17 +11,6 @@
         }
     }
 
-    #list-chatrooms-modal {
-        .modal-body {
-			max-height: 70vh;
-            padding-bottom: 0; // When the list of chats overflows, we don't want bottom padding
-        }
-        .available-chatrooms {
-            overflow: auto;
-            padding-bottom: 1rem;
-        }
-    }
-
     #room-details-modal {
         .features-list {
             margin-left: 1em;
diff --git a/sass/_core.scss b/sass/_core.scss
index ee531e40e..b5dea8219 100644
--- a/sass/_core.scss
+++ b/sass/_core.scss
@@ -327,20 +327,6 @@ body.converse-fullscreen {
         content: close-quote;
     }
 
-    .modal {
-        background-color: rgba(0, 0, 0, 0.4);
-
-        .modal-body {
-            p {
-                padding: 0.25rem 0;
-            }
-        }
-
-        .modal-footer {
-            justify-content: flex-start;
-        }
-    }
-
     .helptext {
         font-size: var(--font-size-tiny);
         color: var(--text-color-lighten-15-percent);
diff --git a/sass/_modal.scss b/sass/_modal.scss
index 670f6e7be..9b4032f1b 100644
--- a/sass/_modal.scss
+++ b/sass/_modal.scss
@@ -1,15 +1,27 @@
 #conversejs {
+
     #converse-modals {
-        .modal-body {
-            margin-bottom: 2em;
-            .confirm {
-                .form-group {
-                    p:first-child {
-                        font-size: 110%;
-                        font-weight: bold;
+        .modal {
+            background-color: rgba(0, 0, 0, 0.4);
+            .modal-body {
+                overflow-y: auto;
+                max-height: 75vh;
+                margin-bottom: 2em;
+                p {
+                    padding: 0.25rem 0;
+                }
+                .confirm {
+                    .form-group {
+                        p:first-child {
+                            font-size: 110%;
+                            font-weight: bold;
+                        }
                     }
                 }
             }
+            .modal-footer {
+                justify-content: flex-start;
+            }
         }
 
         .scrollable-container {