Skip to content

Commit 5809c97

Browse files
committed
Fixes #1666. Fixes #1792. Add scrollbars for modals
1 parent 9bff567 commit 5809c97

File tree

4 files changed

+21
-33
lines changed

4 files changed

+21
-33
lines changed

CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717

1818
- #129: Add support for [XEP-0156: Disovering Alternative XMPP Connection Methods](https://xmpp.org/extensions/xep-0156.html). Only XML is supported for now.
1919
- #1105: Preliminary support for storing persistent data in IndexedDB instead of localStorage
20+
- #1666: Allow scrolling of the OMEMO fingerprints list
2021
- #1691: Fix `collection.chatbox is undefined` errors
2122
- #1772: `_converse.api.contact.add(jid, nick)` fails, says not a function
23+
- #1792: Fix: modals don't have scrollbars
2224
- #1796: Don't show "back" arrow navigation (on mobile) in the chat header when in `singleton` mode
2325

2426
### Breaking changes

sass/_chatrooms.scss

-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#conversejs.converse-embedded,
22
#conversejs {
3-
43
.badge-room-color {
54
background-color: var(--chatroom-head-color);
65
}
@@ -12,17 +11,6 @@
1211
}
1312
}
1413

15-
#list-chatrooms-modal {
16-
.modal-body {
17-
max-height: 70vh;
18-
padding-bottom: 0; // When the list of chats overflows, we don't want bottom padding
19-
}
20-
.available-chatrooms {
21-
overflow: auto;
22-
padding-bottom: 1rem;
23-
}
24-
}
25-
2614
#room-details-modal {
2715
.features-list {
2816
margin-left: 1em;

sass/_core.scss

-14
Original file line numberDiff line numberDiff line change
@@ -327,20 +327,6 @@ body.converse-fullscreen {
327327
content: close-quote;
328328
}
329329

330-
.modal {
331-
background-color: rgba(0, 0, 0, 0.4);
332-
333-
.modal-body {
334-
p {
335-
padding: 0.25rem 0;
336-
}
337-
}
338-
339-
.modal-footer {
340-
justify-content: flex-start;
341-
}
342-
}
343-
344330
.helptext {
345331
font-size: var(--font-size-tiny);
346332
color: var(--text-color-lighten-15-percent);

sass/_modal.scss

+19-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
#conversejs {
2+
23
#converse-modals {
3-
.modal-body {
4-
margin-bottom: 2em;
5-
.confirm {
6-
.form-group {
7-
p:first-child {
8-
font-size: 110%;
9-
font-weight: bold;
4+
.modal {
5+
background-color: rgba(0, 0, 0, 0.4);
6+
.modal-body {
7+
overflow-y: auto;
8+
max-height: 75vh;
9+
margin-bottom: 2em;
10+
p {
11+
padding: 0.25rem 0;
12+
}
13+
.confirm {
14+
.form-group {
15+
p:first-child {
16+
font-size: 110%;
17+
font-weight: bold;
18+
}
1019
}
1120
}
1221
}
22+
.modal-footer {
23+
justify-content: flex-start;
24+
}
1325
}
1426

1527
.scrollable-container {

0 commit comments

Comments
 (0)