Skip to content

C
converse.js
Commit dde2efb6 authored by JC Brand's avatar JC Brand
Browse files
Options

Fix trash icons for pending contacts

parent 174b257c
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 15 deletions
css/converse.css
View file @ dde2efb6
...@@ -11221,8 +11221,6 @@ body.reset { ...@@ -11221,8 +11221,6 @@ body.reset {
margin-left: 5px; } margin-left: 5px; }
#conversejs #converse-roster .roster-contacts .roster-group li:hover { #conversejs #converse-roster .roster-contacts .roster-group li:hover {
background-color: var(--controlbox-head-color-lighten-45-percent); } 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 { #conversejs #converse-roster span.pending-contact-name {
line-height: var(--line-height); line-height: var(--line-height);
width: 100%; } width: 100%; }
......
dist/converse.js
View file @ dde2efb6
...@@ -102832,9 +102832,9 @@ var __t, __p = '', __e = _.escape, __j = Array.prototype.join; ...@@ -102832,9 +102832,9 @@ var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
function print() { __p += __j.call(arguments, '') } function print() { __p += __j.call(arguments, '') }
__p += '<!-- src/templates/pending_contact.html -->\n'; __p += '<!-- src/templates/pending_contact.html -->\n';
if (o.allow_chat_pending_contacts) { ; 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.jid) +
'">' + '">' +
__e(o.display_name) + __e(o.display_name) +
...@@ -102842,7 +102842,7 @@ __e(o.display_name) + ...@@ -102842,7 +102842,7 @@ __e(o.display_name) +
if (o.allow_chat_pending_contacts) { ; if (o.allow_chat_pending_contacts) { ;
__p += '</a>'; __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) + __e(o.desc_remove) +
'" href="#"></a>\n'; '" href="#"></a>\n';
return __p return __p
fullscreen.html
View file @ dde2efb6
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/> <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
<script type="text/javascript" src="inverse-analytics.js"></script> <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> <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" /> <link type="text/css" rel="stylesheet" media="screen" href="css/fullpage.css" />
<script src="3rdparty/libsignal-protocol.js"></script> <script src="3rdparty/libsignal-protocol.js"></script>
<script src="dist/converse.js"></script> <script src="dist/converse.min.js"></script>
</head> </head>
<body class="reset"> <body class="reset">
<div class="converse-content" style="display:none"> <div class="converse-content" style="display:none">
......
index.html
View file @ dde2efb6
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<![if gte IE 11]> <![if gte IE 11]>
<script src="3rdparty/libsignal-protocol.js"></script> <script src="3rdparty/libsignal-protocol.js"></script>
<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" />
<script src="dist/converse.js"></script> <script src="dist/converse.min.js"></script>
<![endif]> <![endif]>
</head> </head>
......
sass/_roster.scss
View file @ dde2efb6
...@@ -142,9 +142,6 @@ ...@@ -142,9 +142,6 @@
} }
&:hover { &:hover {
background-color: var(--controlbox-head-color-lighten-45-percent); background-color: var(--controlbox-head-color-lighten-45-percent);
.remove-xmpp-contact {
display: inline-block;
}
} }
} }
} }
......
src/templates/pending_contact.html
View file @ dde2efb6
{[ if (o.allow_chat_pending_contacts) { ]}<a class="open-chat w-100" href="#">{[ } ]} {[ if (o.allow_chat_pending_contacts) { ]}
<span class="pending-contact-name w-100" title="JID: {{{o.jid}}}">{{{o.display_name}}}</span> <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>{[ } ]} {[ 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>
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7