Pārlūkot izejas kodu

Bugfix: wrong color shown for chat statuses

JC Brand 5 mēneši atpakaļ
vecāks
revīzija
23529ce116

+ 9 - 3
src/plugins/rosterview/styles/roster.scss

@@ -24,8 +24,12 @@
         margin: 0;
         padding: 0;
 
-        svg {
-            fill: var(--chat-color) !important;
+        converse-dropdown {
+            converse-icon {
+                svg {
+                    fill: var(--chat-color) !important;
+                }
+            }
         }
 
         .roster-contacts {
@@ -69,9 +73,11 @@
                     }
                     converse-icon {
                         padding-top: 0.5em;
+                        svg {
+                            fill: var(--chat-color) !important;
+                        }
                     }
                 }
-
             }
 
             .group-toggle {

+ 1 - 1
src/plugins/rosterview/templates/roster_item.js

@@ -31,7 +31,7 @@ export default  (el) => {
     } else if (show === 'away') {
         [classes, color] =  ['fa fa-circle', 'chat-status-away'];
     } else {
-        [classes, color] = ['fa fa-circle', 'comment'];
+        [classes, color] = ['fa fa-circle', 'chat-status-offline'];
     }
 
    const is_self = bare_jid === el.model.get('jid');

+ 3 - 3
src/plugins/rosterview/tests/roster.js

@@ -795,7 +795,7 @@ describe("The Contacts Roster", function () {
             await mock.waitForRoster(_converse, 'current', 1);
             await mock.openControlBox(_converse);
             const icon_el = document.querySelector('converse-roster-contact converse-icon');
-            expect(icon_el.getAttribute('color')).toBe('var(--comment)');
+            expect(icon_el.getAttribute('color')).toBe('var(--chat-status-offline)');
 
             let pres = $pres({from: 'mercutio@montague.lit/resource'});
             _converse.api.connection.get()._dataRecv(mock.createRequest(pres));
@@ -807,7 +807,7 @@ describe("The Contacts Roster", function () {
 
             pres = $pres({from: 'mercutio@montague.lit/resource'}).c('show', 'xa');
             _converse.api.connection.get()._dataRecv(mock.createRequest(pres));
-            await u.waitUntil(() => icon_el.getAttribute('color') === 'var(--comment)');
+            await u.waitUntil(() => icon_el.getAttribute('color') === 'var(--chat-status-offline)');
 
             pres = $pres({from: 'mercutio@montague.lit/resource'}).c('show', 'dnd');
             _converse.api.connection.get()._dataRecv(mock.createRequest(pres));
@@ -815,7 +815,7 @@ describe("The Contacts Roster", function () {
 
             pres = $pres({from: 'mercutio@montague.lit/resource', type: 'unavailable'});
             _converse.api.connection.get()._dataRecv(mock.createRequest(pres));
-            await u.waitUntil(() => icon_el.getAttribute('color') === 'var(--comment)');
+            await u.waitUntil(() => icon_el.getAttribute('color') === 'var(--chat-status-offline)');
         }));
 
         it("can be added to the roster and they will be sorted alphabetically",