Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Some small css fixes. Show correct icon for clearing messages

Browse Source
This commit is contained in:
JC Brand 2017-05-15 17:38:13 +02:00
parent 4994615824
commit 3343cb6991
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
css/converse.css
View File

@ -229,6 +229,9 @@
#converse-embedded-chat .icon-remove:before, #converse-embedded-chat .icon-remove:before,
#conversejs .icon-remove:before { #conversejs .icon-remove:before {
content: "\2715"; } content: "\2715"; }
#converse-embedded-chat .icon-trash:before,
#conversejs .icon-trash:before {
content: "\e02d"; }
#converse-embedded-chat .icon-room-info:before, #converse-embedded-chat .icon-room-info:before,
#conversejs .icon-room-info:before { #conversejs .icon-room-info:before {
content: "\e059"; } content: "\e059"; }
@ -1967,7 +1970,8 @@
#conversejs #controlbox .dropdown dd ul li:hover { #conversejs #controlbox .dropdown dd ul li:hover {
background-color: #DCF9F6; } background-color: #DCF9F6; }
#conversejs #controlbox .dropdown dd.search-xmpp { #conversejs #controlbox .dropdown dd.search-xmpp {
display: none; } display: none;
width: 100%; }
#conversejs #controlbox .dropdown dd.search-xmpp ul { #conversejs #controlbox .dropdown dd.search-xmpp ul {
box-shadow: 1px 4px 10px 1px rgba(0, 0, 0, 0.4); } box-shadow: 1px 4px 10px 1px rgba(0, 0, 0, 0.4); }
#conversejs #controlbox .dropdown dd.search-xmpp ul li:hover { #conversejs #controlbox .dropdown dd.search-xmpp ul li:hover {
@ -2132,7 +2136,7 @@
#conversejs #converse-roster .search-xmpp ul li.chat-info { #conversejs #converse-roster .search-xmpp ul li.chat-info {
padding-left: 10px; } padding-left: 10px; }
#conversejs #converse-roster .roster-filter-form { #conversejs #converse-roster .roster-filter-form {
margin: 0 1em; margin: 0 1em 0.5em 1em;
width: 100%; width: 100%;
padding-right: 2em; padding-right: 2em;
/* (jQ addClass:) if input has value: */ /* (jQ addClass:) if input has value: */
@ -2365,6 +2369,7 @@
#conversejs #converse-roster .roster-contacts dd a.decline-xmpp-request { #conversejs #converse-roster .roster-contacts dd a.decline-xmpp-request {
margin-left: 5px; } margin-left: 5px; }
#conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact { #conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact {
font-size: 10px;
float: right; float: right;
margin-right: 1em; margin-right: 1em;
padding-top: 0.5em; padding-top: 0.5em;

1
sass/_fonts.scss
View File

@ -94,6 +94,7 @@
.icon-radio-checked:before { content: "\2b26"; } .icon-radio-checked:before { content: "\2b26"; }
.icon-radio-unchecked:before { content: "\2b25"; } .icon-radio-unchecked:before { content: "\2b25"; }
.icon-remove:before { content: "\2715"; } .icon-remove:before { content: "\2715"; }
.icon-trash:before { content: "\e02d"; }
.icon-room-info:before { content: "\e059"; } .icon-room-info:before { content: "\e059"; }
.icon-sad:before { content: "\2639"; } .icon-sad:before { content: "\2639"; }
.icon-save:before { content: "\f0c7"; } .icon-save:before { content: "\f0c7"; }

3
sass/_roster.scss
View File

@ -27,7 +27,7 @@
} }
.roster-filter-form { .roster-filter-form {
margin: 0 1em; margin: 0 1em 0.5em 1em;
width: 100%; width: 100%;
padding-right: 1em + 2*$chat-gutter; padding-right: 1em + 2*$chat-gutter;
.roster-filter { .roster-filter {
@ -255,6 +255,7 @@
margin-left: 5px; margin-left: 5px;
} }
&.remove-xmpp-contact { &.remove-xmpp-contact {
font-size: $font-size-tiny;
float: right; float: right;
margin-right: 1em; margin-right: 1em;
padding-top: 0.5em; padding-top: 0.5em;

2
src/templates/chatroom_toolbar.html
View File

@ -24,6 +24,6 @@
<li class="toggle-occupants"><a class="icon-hide-users" title="{{{label_hide_occupants}}}"></a></li> <li class="toggle-occupants"><a class="icon-hide-users" title="{{{label_hide_occupants}}}"></a></li>
{[ } ]} {[ } ]}
{[ if (show_clear_button) { ]} {[ if (show_clear_button) { ]}
<li class="toggle-clear"><a class="icon-remove" title="{{{label_clear}}}"></a></li> <li class="toggle-clear"><a class="icon-trash" title="{{{label_clear}}}"></a></li>
{[ } ]} {[ } ]}