Fix trash icons for pending contacts

dde2efb6 · JC Brand · 174b257c · dde2efb6 · dde2efb6 · dde2efb6
Commit dde2efb6 authored Nov 14, 2018 by JC Brand
6 changed files
--- a/css/converse.css
+++ b/css/converse.css
@@ -11221,8 +11221,6 @@ body.reset {
        margin-left: 5px; }
      #conversejs #converse-roster .roster-contacts .roster-group li:hover {
        background-color: var(--controlbox-head-color-lighten-45-percent); }
-        #conversejs #converse-roster .roster-contacts .roster-group li:hover .remove-xmpp-contact {
-          display: inline-block; }
  #conversejs #converse-roster span.pending-contact-name {
    line-height: var(--line-height);
    width: 100%; }

--- a/dist/converse.js
+++ b/dist/converse.js
@@ -102832,9 +102832,9 @@ var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
 function print() { __p += __j.call(arguments, '') }
 __p += '<!-- src/templates/pending_contact.html -->\n';
 if (o.allow_chat_pending_contacts)  { ;
-__p += '<a class="open-chat w-100" href="#">';
+__p += '\n<a class="list-item-link open-chat w-100" href="#">\n';
 } ;
-__p += '\n<span class="pending-contact-name w-100" title="JID: ' +
+__p += '\n<span class="pending-contact-name" title="JID: ' +
 __e(o.jid) +
 '">' +
 __e(o.display_name) +
@@ -102842,7 +102842,7 @@ __e(o.display_name) +
 if (o.allow_chat_pending_contacts)  { ;
 __p += '</a>';
 } ;
-__p += '\n<a class="remove-xmpp-contact far fa-trash-alt" title="' +
+__p += '\n<a class="list-item-action remove-xmpp-contact far fa-trash-alt" title="' +
 __e(o.desc_remove) +
 '" href="#"></a>\n';
 return __p
--- a/fullscreen.html
+++ b/fullscreen.html
@@ -7,10 +7,10 @@
    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
    <script type="text/javascript" src="inverse-analytics.js"></script>
    <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=5" style="border:0;" alt="" /></p></noscript>
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="css/fullpage.css" />
    <script src="3rdparty/libsignal-protocol.js"></script>
-    <script src="dist/converse.js"></script>
+    <script src="dist/converse.min.js"></script>
 </head>
 <body class="reset">
    <div class="converse-content" style="display:none">

--- a/index.html
+++ b/index.html
@@ -20,8 +20,8 @@

    <![if gte IE 11]>
        <script src="3rdparty/libsignal-protocol.js"></script>
-        <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
-        <script src="dist/converse.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
+        <script src="dist/converse.min.js"></script>
    <![endif]>
 </head>


--- a/sass/_roster.scss
+++ b/sass/_roster.scss
@@ -142,9 +142,6 @@
                }
                &:hover {
                    background-color: var(--controlbox-head-color-lighten-45-percent);
-                    .remove-xmpp-contact {
-                        display: inline-block;
-                    }
                }
            }
        }

--- a/src/templates/pending_contact.html
+++ b/src/templates/pending_contact.html
-{[ if (o.allow_chat_pending_contacts)  { ]}<a class="open-chat w-100" href="#">{[ } ]}
-<span class="pending-contact-name w-100" title="JID: {{{o.jid}}}">{{{o.display_name}}}</span> 
+{[ if (o.allow_chat_pending_contacts)  { ]}
+<a class="list-item-link open-chat w-100" href="#">
+{[ } ]}
+<span class="pending-contact-name" title="JID: {{{o.jid}}}">{{{o.display_name}}}</span> 
 {[ if (o.allow_chat_pending_contacts)  { ]}</a>{[ } ]}
-<a class="remove-xmpp-contact far fa-trash-alt" title="{{{o.desc_remove}}}" href="#"></a>
+<a class="list-item-action remove-xmpp-contact far fa-trash-alt" title="{{{o.desc_remove}}}" href="#"></a>