Commit 4e3a81d6 authored by JC Brand's avatar JC Brand

Fixes #2337

Newly opened headline chat isn't hidden by default in fullscreen view

Also include some CSS fixes for fullscreen headlines boxes
parent 1b50696c
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
} }
.chat-body { .chat-body {
background-color: var(--headline-head-color); background-color: var(--headline-head-color);
border-radius: var(--chatbox-border-radius);
.chat-message { .chat-message {
color: var(--headline-message-color); color: var(--headline-message-color);
} }
...@@ -20,6 +19,16 @@ ...@@ -20,6 +19,16 @@
height: 100%; height: 100%;
} }
} }
.message {
&.chat-msg {
&.headline {
.chat-msg__body {
margin-left: 0;
}
}
}
}
} }
#conversejs.converse-fullscreen { #conversejs.converse-fullscreen {
...@@ -33,9 +42,7 @@ ...@@ -33,9 +42,7 @@
} }
} }
.flyout { .flyout {
border: var(--flyout-padding) solid var(--headline-head-color); border-color: var(--headline-head-color);
border-top: 0.8em solid var(--headline-head-color);
} }
} }
} }
...@@ -180,11 +180,6 @@ ...@@ -180,11 +180,6 @@
cursor: pointer; cursor: pointer;
padding-right: 0.5em; padding-right: 0.5em;
} }
&.headline {
.chat-msg__body {
margin-left: 0;
}
}
.chat-msg__subject { .chat-msg__subject {
font-weight: bold; font-weight: bold;
......
...@@ -49,8 +49,6 @@ $mobile_portrait_length: 480px !default; ...@@ -49,8 +49,6 @@ $mobile_portrait_length: 480px !default;
--roster-height: 194px; --roster-height: 194px;
--flyout-padding: 0.5em;
--chat-correcting-color: var(--chat-head-color-lighten-50-percent); --chat-correcting-color: var(--chat-head-color-lighten-50-percent);
--chat-head-color-dark: #1E9652; --chat-head-color-dark: #1E9652;
--chat-head-color-darker: #0E763B; --chat-head-color-darker: #0E763B;
......
...@@ -313,9 +313,9 @@ window.addEventListener('converse-loaded', () => { ...@@ -313,9 +313,9 @@ window.addEventListener('converse-loaded', () => {
}; };
mock.openAndEnterChatRoom = async function (_converse, muc_jid, nick, features=[], members=[]) { mock.openAndEnterChatRoom = async function (_converse, muc_jid, nick, features=[], members=[], force_open=true) {
muc_jid = muc_jid.toLowerCase(); muc_jid = muc_jid.toLowerCase();
const room_creation_promise = _converse.api.rooms.open(muc_jid); const room_creation_promise = _converse.api.rooms.open(muc_jid, {}, force_open);
await mock.getRoomFeatures(_converse, muc_jid, features); await mock.getRoomFeatures(_converse, muc_jid, features);
await mock.waitForReservedNick(_converse, muc_jid, nick); await mock.waitForReservedNick(_converse, muc_jid, nick);
// The user has just entered the room (because join was called) // The user has just entered the room (because join was called)
......
...@@ -16,7 +16,7 @@ const u = converse.env.utils; ...@@ -16,7 +16,7 @@ const u = converse.env.utils;
const HeadlinesBoxView = ChatBoxView.extend({ const HeadlinesBoxView = ChatBoxView.extend({
className: 'chatbox headlines', className: 'chatbox headlines hidden',
events: { events: {
'click .close-chatbox-button': 'close', 'click .close-chatbox-button': 'close',
......
...@@ -2853,7 +2853,7 @@ converse.plugins.add('converse-muc', { ...@@ -2853,7 +2853,7 @@ converse.plugins.add('converse-muc', {
* } * }
* ); * );
*/ */
async open (jids, attrs, force=false) { async open (jids, attrs={}, force=false) {
await api.waitUntil('chatBoxesFetched'); await api.waitUntil('chatBoxesFetched');
if (jids === undefined) { if (jids === undefined) {
const err_msg = 'rooms.open: You need to provide at least one JID'; const err_msg = 'rooms.open: You need to provide at least one JID';
......
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