From 18e48be5c4df9589f9056a8e180fcabd3f879b67 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Mon, 8 Feb 2021 10:16:39 +0100
Subject: [PATCH] Move CSS fixes before merge

---
 sass/_autocomplete.scss                       | 22 +++++++++----------
 sass/_chatbox.scss                            | 14 +++++-------
 sass/_controlbox.scss                         |  4 +++-
 sass/_roster.scss                             | 14 ++++++++----
 sass/_variables.scss                          |  2 +-
 .../rosterview/templates/roster_item.js       |  2 +-
 6 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/sass/_autocomplete.scss b/sass/_autocomplete.scss
index 2b6cb4a53..ffca4846b 100644
--- a/sass/_autocomplete.scss
+++ b/sass/_autocomplete.scss
@@ -124,18 +124,16 @@
         background: var(--completion-normal-color);
         color: inherit;
     }
+}
 
-    converse-chats {
-        &.converse-fullscreen {
-            .suggestion-box__results--above {
-                bottom: 4.5em;
-            }
-        }
-
-        &.converse-overlayed {
-            .suggestion-box__results--above {
-                bottom: 3.5em;
-            }
-        }
+#conversejs.converse-fullscreen {
+    .suggestion-box__results--above {
+        bottom: 4.5em;
+    }
+}
+
+#conversejs.converse-overlayed {
+    .suggestion-box__results--above {
+        bottom: 3.5em;
     }
 }
diff --git a/sass/_chatbox.scss b/sass/_chatbox.scss
index d95720e40..822bf8129 100644
--- a/sass/_chatbox.scss
+++ b/sass/_chatbox.scss
@@ -184,7 +184,7 @@
             display: flex;
             flex-direction: column;
             justify-content: space-between;
-            background-color: var(--chat-head-color);
+            background-color: var(--chat-textarea-background-color);
             border-bottom-left-radius: var(--chatbox-border-radius);
             border-bottom-right-radius: var(--chatbox-border-radius);
 
@@ -468,13 +468,11 @@
 }
 
 @include media-breakpoint-down(sm) {
-    #conversejs {
-        converse-chats.converse-overlayed {
-            > .row {
-                flex-direction: column;
-                &.no-gutters {
-                    margin: -1em;
-                }
+    #conversejs.converse-overlayed {
+        > .row {
+            flex-direction: column;
+            &.no-gutters {
+                margin: -1em;
             }
         }
     }
diff --git a/sass/_controlbox.scss b/sass/_controlbox.scss
index b0bbe9987..31173b350 100644
--- a/sass/_controlbox.scss
+++ b/sass/_controlbox.scss
@@ -95,7 +95,6 @@
         }
 
         .box-flyout {
-            margin-left: 0;
             background-color: var(--controlbox-pane-background-color);
         }
 
@@ -576,6 +575,9 @@
         }
 
         &.converse-fullscreen {
+            #controlbox {
+                margin-left: -15px;
+            }
             .controlbox-panes {
                 padding-top: 2em;
             }
diff --git a/sass/_roster.scss b/sass/_roster.scss
index a2e959732..45849dfe0 100644
--- a/sass/_roster.scss
+++ b/sass/_roster.scss
@@ -9,6 +9,7 @@
     // XXX: FIXME
     height: calc(100% - 70px);
 
+
     /* Custom addition for CSP */
     #online-count {
         display: none;
@@ -55,6 +56,15 @@
         overflow-y: auto;
         color: var(--text-color);
 
+        converse-roster-contact {
+            width: 100%;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            display: flex;
+            justify-content: space-between;
+        }
+
         .group-toggle {
             font-family: var(--heading-font);
             display: block;
@@ -133,9 +143,6 @@
                 }
 
                 .contact-name {
-                    overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
                     padding: 0;
                     margin: 0;
                     max-width: 85%;
@@ -154,7 +161,6 @@
                 /* Make this difference */
             }
             a, span {
-                overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
             }
diff --git a/sass/_variables.scss b/sass/_variables.scss
index e19bd4b69..780422465 100644
--- a/sass/_variables.scss
+++ b/sass/_variables.scss
@@ -1,7 +1,7 @@
 $mobile_landscape_height: 450px !default;
 $mobile_portrait_length: 480px !default;
 
-#conversejs, #conversejs-bg, .converse-fullscreen {
+#conversejs, #conversejs-bg, body.converse-fullscreen {
     --subdued-color: #A8ABA1;
 
     --green: #3AA569;
diff --git a/src/plugins/rosterview/templates/roster_item.js b/src/plugins/rosterview/templates/roster_item.js
index 0cf038121..47e02efe2 100644
--- a/src/plugins/rosterview/templates/roster_item.js
+++ b/src/plugins/rosterview/templates/roster_item.js
@@ -7,7 +7,7 @@ export default  (o) => {
    const i18n_chat = __('Click to chat with %1$s (XMPP address: %2$s)', o.display_name, o.jid);
    const i18n_remove = __('Click to remove %1$s as a contact', o.display_name);
    return html`
-   <a class="list-item-link cbox-list-item open-chat w-100 ${ o.num_unread ? 'unread-msgs' : '' }" title="${i18n_chat}" href="#" @click=${o.openChat}>
+   <a class="list-item-link cbox-list-item open-chat ${ o.num_unread ? 'unread-msgs' : '' }" title="${i18n_chat}" href="#" @click=${o.openChat}>
       ${ renderAvatar(o.getAvatarData()) }
       <span class="${o.status_icon}" title="${o.desc_status}"></span>
       ${ o.num_unread ? html`<span class="msgs-indicator">${ o.num_unread }</span>` : '' }