Commit d17ae811 authored by JC Brand's avatar JC Brand

More CSS and test fixes

parent f367157d
......@@ -308,7 +308,7 @@
left: 0;
text-align: left;
overflow-x: hidden;
padding: 1em 0 1em 0;
padding: 0 0 1em 0;
.controlbox-padded {
padding-left: 1em;
......@@ -407,6 +407,7 @@
flex-direction: row-reverse;
flex-wrap: nowrap;
justify-content: space-between;
min-height: 0;
.brand-heading {
color: var(--text-color);
......@@ -605,6 +606,12 @@
}
}
#conversejs.converse-fullscreen {
.controlbox-panes {
padding-top: 1em;
}
}
#conversejs.converse-overlayed {
.brand-heading {
padding-top: 0.8rem;
......@@ -618,5 +625,8 @@
#converse-login-panel {
height: 100%;
}
.controlbox-panes {
margin-top: 0.5em;
}
}
}
......@@ -2506,7 +2506,7 @@
expect(chatroomview.model.features.get('temporary')).toBe(true);
expect(chatroomview.model.features.get('unmoderated')).toBe(true);
expect(chatroomview.model.features.get('unsecured')).toBe(false);
expect(chatroomview.el.querySelector('.chat-title').textContent.trim()).toBe('Room');
expect(chatroomview.el.querySelector('.chatbox-title__text').textContent.trim()).toBe('Room');
chatroomview.el.querySelector('.configure-chatroom-button').click();
......@@ -2656,7 +2656,7 @@
expect(chatroomview.model.features.get('temporary')).toBe(true);
expect(chatroomview.model.features.get('unmoderated')).toBe(true);
expect(chatroomview.model.features.get('unsecured')).toBe(false);
expect(chatroomview.el.querySelector('.chat-title').textContent.trim()).toBe('New room name');
expect(chatroomview.el.querySelector('.chatbox-title__text').textContent.trim()).toBe('New room name');
done();
}));
......
......@@ -814,16 +814,20 @@ converse.plugins.add('converse-chatview', {
*/
_converse.api.trigger('messageSend', message);
}
const el = this.content.parentElement;
el.style.display = 'none';
if (_converse.view_mode === 'overlayed') {
// XXX: Chrome flex bug workaround. The .chat-content area
// doesn't resize when the textarea is resized to its original size.
this.content.parentElement.style.display = 'none';
}
textarea.removeAttribute('disabled');
u.removeClass('disabled', textarea);
textarea.focus();
// XXX: Chrome flex bug workaround. The .chat-content area
// doesn't resize when the textarea is resized to its original size.
el.style.display = '';
if (_converse.view_mode === 'overlayed') {
// XXX: Chrome flex bug workaround.
this.content.parentElement.style.display = '';
}
// Suppress events, otherwise superfluous CSN gets set
// immediately after the message, causing rate-limiting issues.
......
......@@ -25,6 +25,7 @@
enable_smacks: true,
i18n: 'en',
message_archiving: 'always',
persistent_store: 'IndexedDB',
muc_domain: 'conference.chat.example.org',
muc_respect_autojoin: true,
view_mode: 'overlayed',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment