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

Merge branch 'master' into plugins-refactor

Browse Source
This commit is contained in:
JC Brand 2015-05-14 12:08:32 +02:00
commit 695dffac90
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/converse.css
View File

@ -1222,7 +1222,7 @@
color: #681F2C; }
#conversejs .set-xmpp-status {
background: none;
padding: 0.5em; }
padding: 0.75em 0.5em 0.5em 0.5em; }
#conversejs .set-xmpp-status .dropdown dd ul {
z-index: 22; }
#conversejs .minimized-chats-flyout,

2
css/converse.css.map
View File

File diff suppressed because one or more lines are too long

2
src/templates/toolbar.html
View File

@ -1,5 +1,5 @@
{[ if (show_emoticons) { ]}
<li class="toggle-smiley icon-happy" title="Insert a smilery">
<li class="toggle-smiley icon-happy" title="Insert a smiley">
<ul>
<li><a class="icon-smiley" href="#" data-emoticon=":)"></a></li>
<li><a class="icon-wink" href="#" data-emoticon=";)"></a></li>