Added HD smilies

Images from emojione.com

diff --git a/com.woltlab.wcf/smiley.xml b/com.woltlab.wcf/smiley.xml
index 008ceb8d1a14924f52ef19d7295650d476af9aff..148459597bf5b501e9dd369ac756db5d36190d4c 100644 (file)
--- a/com.woltlab.wcf/smiley.xml
+++ b/com.woltlab.wcf/smiley.xml
@@ -3,158 +3,155 @@
        <import>
                <smiley name=":)">
                        <title>smile</title>
-                       <path>images/smilies/smile.png</path>
+                       <path>images/smilies/smile_emojione.png</path>
                        <aliases><![CDATA[:-)
 (:]]></aliases>
                </smiley>
                <smiley name=":(">
                        <title>sad</title>
-                       <path>images/smilies/sad.png</path>
+                       <path>images/smilies/sad_emojione.png</path>
                        <aliases><![CDATA[:-(
 ):]]></aliases>
                </smiley>
                <smiley name=";)">
                        <title>wink</title>
-                       <path>images/smilies/wink.png</path>
+                       <path>images/smilies/wink_emojione.png</path>
                        <aliases><![CDATA[;-)
 (;]]></aliases>
                </smiley>
                <smiley name=":P">
                        <title>tongue</title>
-                       <path>images/smilies/tongue.png</path>
+                       <path>images/smilies/tongue_emojione.png</path>
                        <aliases><![CDATA[:-P]]></aliases>
                </smiley>
                <smiley name="^^">
                        <title>grin</title>
-                       <path>images/smilies/grin.png</path>
+                       <path>images/smilies/grin_emojione.png</path>
                        <aliases><![CDATA[^.^
 ^_^
 ^-^]]></aliases>
                </smiley>
                <smiley name=":D">
                        <title>biggrin</title>
-                       <path>images/smilies/biggrin.png</path>
+                       <path>images/smilies/biggrin_emojione.png</path>
                        <aliases><![CDATA[:-D]]></aliases>
                </smiley>
                <smiley name=";(">
                        <title>crying</title>
-                       <path>images/smilies/crying.png</path>
+                       <path>images/smilies/crying_emojione.png</path>
                        <aliases><![CDATA[;-(
 :'(
 ;_;]]></aliases>
                </smiley>
                <smiley name="X(">
                        <title>angry</title>
-                       <path>images/smilies/angry.png</path>
+                       <path>images/smilies/angry_emojione.png</path>
                        <aliases><![CDATA[>.<
 >_<]]></aliases>
                </smiley>
                <smiley name=":*">
                        <title>kiss</title>
-                       <path>images/smilies/kiss.png</path>
+                       <path>images/smilies/kiss_emojione.png</path>
                        <aliases><![CDATA[:-*
 *:]]></aliases>
                </smiley>
                <smiley name=":|">
                        <title>mellow</title>
-                       <path>images/smilies/mellow.png</path>
+                       <path>images/smilies/mellow_emojione.png</path>
                </smiley>
                <smiley name="8o">
                        <title>w00t</title>
-                       <path>images/smilies/w00t.png</path>
+                       <path>images/smilies/w00t_emojione.png</path>
                </smiley>
                <smiley name="=O">
                        <title>scared</title>
-                       <path>images/smilies/scared.png</path>
+                       <path>images/smilies/scared_emojione.png</path>
                </smiley>
                <smiley name="&lt;X">
                        <title>sick</title>
-                       <path>images/smilies/sick.png</path>
+                       <path>images/smilies/sick_emojione.png</path>
                </smiley>
                <smiley name="||">
                        <title>tired</title>
-                       <path>images/smilies/tired.png</path>
+                       <path>images/smilies/tired_emojione.png</path>
                </smiley>
                <smiley name=":/">
                        <title>unsure</title>
-                       <path>images/smilies/unsure.png</path>
+                       <path>images/smilies/unsure_emojione.png</path>
                </smiley>
                <smiley name=":S">
                        <title>wacko</title>
-                       <path>images/smilies/wacko.png</path>
+                       <path>images/smilies/wacko_emojione.png</path>
                </smiley>
                <smiley name="X/">
                        <title>pinch</title>
-                       <path>images/smilies/pinch.png</path>
+                       <path>images/smilies/pinch_emojione.png</path>
                </smiley>
                <smiley name="8)">
                        <title>cool</title>
-                       <path>images/smilies/cool.png</path>
+                       <path>images/smilies/cool_emojione.png</path>
                </smiley>
                <smiley name="?(">
                        <title>confused</title>
-                       <path>images/smilies/confused.png</path>
+                       <path>images/smilies/confused_emojione.png</path>
                </smiley>
                <smiley name=":huh:">
                        <title>Huh</title>
-                       <path>images/smilies/huh.png</path>
+                       <path>images/smilies/huh_emojione.png</path>
                </smiley>
                <smiley name=":rolleyes:">
                        <title>rolleyes</title>
-                       <path>images/smilies/rolleyes.png</path>
+                       <path>images/smilies/rolleyes_emojione.png</path>
                </smiley>
                <smiley name=":love:">
                        <title>love</title>
-                       <path>images/smilies/love.png</path>
+                       <path>images/smilies/love_emojione.png</path>
                </smiley>
                <smiley name="8|">
                        <title>blink</title>
-                       <path>images/smilies/blink.png</path>
+                       <path>images/smilies/blink_emojione.png</path>
                        <aliases><![CDATA[o.O]]></aliases>
                </smiley>
                <smiley name=":cursing:">
                        <title>cursing</title>
-                       <path>images/smilies/cursing.png</path>
+                       <path>images/smilies/cursing_emojione.png</path>
                </smiley>
                <smiley name=":thumbdown:">
                        <title>thumbdown</title>
-                       <path>images/smilies/thumbdown.png</path>
-               </smiley>
-               <smiley name=":thumbsup:">
-                       <title>thumbsup</title>
-                       <path>images/smilies/thumbsup.png</path>
+                       <path>images/smilies/thumbdown_emojione.png</path>
                </smiley>
                <smiley name=":thumbup:">
                        <title>thumbup</title>
-                       <path>images/smilies/thumbup.png</path>
+                       <path>images/smilies/thumbup_emojione.png</path>
+                       <aliases><![CDATA[:thumbsup:]]></aliases>
                </smiley>
                <smiley name=":sleeping:">
                        <title>sleeping</title>
-                       <path>images/smilies/sleeping.png</path>
+                       <path>images/smilies/sleeping_emojione.png</path>
                </smiley>
                <smiley name=":whistling:">
                        <title>whistling</title>
-                       <path>images/smilies/whistling.png</path>
+                       <path>images/smilies/whistling_emojione.png</path>
                </smiley>
                <smiley name=":evil:">
                        <title>evil</title>
-                       <path>images/smilies/evil.png</path>
+                       <path>images/smilies/evil_emojione.png</path>
                </smiley>
                <smiley name=":saint:">
                        <title>saint</title>
-                       <path>images/smilies/saint.png</path>
+                       <path>images/smilies/saint_emojione.png</path>
                </smiley>
                <smiley name="&lt;3">
                        <title>heart</title>
-                       <path>images/smilies/heart.png</path>
+                       <path>images/smilies/heart_emojione.png</path>
                </smiley>
                <smiley name=":!:">
                        <title>attention</title>
-                       <path>images/smilies/attention.png</path>
+                       <path>images/smilies/attention_emojione.png</path>
                </smiley>
                <smiley name=":?:">
                        <title>question</title>
-                       <path>images/smilies/question.png</path>
+                       <path>images/smilies/question_emojione.png</path>
                </smiley>
        </import>
 </data>

diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl
index a312333b1476e28934554e22a64943f85e5b47f3..9b216af2bd84d25ed3cc6e02959b8c33e821816f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/smileyList.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyList.tpl
@@ -47,7 +47,7 @@
                                                {foreach from=$objects item=smiley}
                                                        <li class="sortableNode sortableNoNesting smileyRow" data-object-id="{@$smiley->smileyID}">
                                                                <span class="sortableNodeLabel">
-                                                                       <a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><img src="{$smiley->getURL()}" alt=""/ > {lang}{$smiley->smileyTitle}{/lang}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge" style="margin-left: 5px">{$alias}</span>{/foreach}
+                                                                       <a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><img src="{$smiley->getURL()}" alt="" class="smiley"> {lang}{$smiley->smileyTitle}{/lang}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge" style="margin-left: 5px">{$alias}</span>{/foreach}
                                                                        
                                                                        <span class="statusDisplay sortableButtonContainer">
                                                                                <a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>

diff --git a/wcfsetup/install/files/images/smilies/angry.png b/wcfsetup/install/files/images/smilies/angry.png
deleted file mode 100644 (file)
index e16d826..0000000
Binary files a/wcfsetup/install/files/images/smilies/angry.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/angry_emojione.png b/wcfsetup/install/files/images/smilies/angry_emojione.png
new file mode 100644 (file)
index 0000000..cfc4a6e
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/angry_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/attention.png b/wcfsetup/install/files/images/smilies/attention.png
deleted file mode 100644 (file)
index e75f040..0000000
Binary files a/wcfsetup/install/files/images/smilies/attention.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/attention_emojione.png b/wcfsetup/install/files/images/smilies/attention_emojione.png
new file mode 100644 (file)
index 0000000..2c14406
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/attention_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/biggrin.png b/wcfsetup/install/files/images/smilies/biggrin.png
deleted file mode 100644 (file)
index 3772ea7..0000000
Binary files a/wcfsetup/install/files/images/smilies/biggrin.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/biggrin_emojione.png b/wcfsetup/install/files/images/smilies/biggrin_emojione.png
new file mode 100644 (file)
index 0000000..418d94c
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/biggrin_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/blink.png b/wcfsetup/install/files/images/smilies/blink.png
deleted file mode 100644 (file)
index d566137..0000000
Binary files a/wcfsetup/install/files/images/smilies/blink.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/blink_emojione.png b/wcfsetup/install/files/images/smilies/blink_emojione.png
new file mode 100644 (file)
index 0000000..bd0ac55
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/blink_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/confused.png b/wcfsetup/install/files/images/smilies/confused.png
deleted file mode 100644 (file)
index 1a42f19..0000000
Binary files a/wcfsetup/install/files/images/smilies/confused.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/confused_emojione.png b/wcfsetup/install/files/images/smilies/confused_emojione.png
new file mode 100644 (file)
index 0000000..cad0e23
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/confused_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/cool.png b/wcfsetup/install/files/images/smilies/cool.png
deleted file mode 100644 (file)
index 727de81..0000000
Binary files a/wcfsetup/install/files/images/smilies/cool.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/cool_emojione.png b/wcfsetup/install/files/images/smilies/cool_emojione.png
new file mode 100644 (file)
index 0000000..2001173
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/cool_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/crying.png b/wcfsetup/install/files/images/smilies/crying.png
deleted file mode 100644 (file)
index 05aea3d..0000000
Binary files a/wcfsetup/install/files/images/smilies/crying.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/crying_emojione.png b/wcfsetup/install/files/images/smilies/crying_emojione.png
new file mode 100644 (file)
index 0000000..52e3517
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/crying_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/cursing.png b/wcfsetup/install/files/images/smilies/cursing.png
deleted file mode 100644 (file)
index 591bb65..0000000
Binary files a/wcfsetup/install/files/images/smilies/cursing.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/cursing_emojione.png b/wcfsetup/install/files/images/smilies/cursing_emojione.png
new file mode 100644 (file)
index 0000000..9d739bd
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/cursing_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/evil.png b/wcfsetup/install/files/images/smilies/evil.png
deleted file mode 100644 (file)
index bf81060..0000000
Binary files a/wcfsetup/install/files/images/smilies/evil.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/evil_emojione.png b/wcfsetup/install/files/images/smilies/evil_emojione.png
new file mode 100644 (file)
index 0000000..cc2c5f1
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/evil_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/grin.png b/wcfsetup/install/files/images/smilies/grin.png
deleted file mode 100644 (file)
index 8950626..0000000
Binary files a/wcfsetup/install/files/images/smilies/grin.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/grin_emojione.png b/wcfsetup/install/files/images/smilies/grin_emojione.png
new file mode 100644 (file)
index 0000000..30957a6
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/grin_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/heart.png b/wcfsetup/install/files/images/smilies/heart.png
deleted file mode 100644 (file)
index 4aa3120..0000000
Binary files a/wcfsetup/install/files/images/smilies/heart.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/heart_emojione.png b/wcfsetup/install/files/images/smilies/heart_emojione.png
new file mode 100644 (file)
index 0000000..638cb72
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/heart_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/huh.png b/wcfsetup/install/files/images/smilies/huh.png
deleted file mode 100644 (file)
index ef3f6d9..0000000
Binary files a/wcfsetup/install/files/images/smilies/huh.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/huh_emojione.png b/wcfsetup/install/files/images/smilies/huh_emojione.png
new file mode 100644 (file)
index 0000000..f99026a
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/huh_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/kiss.png b/wcfsetup/install/files/images/smilies/kiss.png
deleted file mode 100644 (file)
index e7bf282..0000000
Binary files a/wcfsetup/install/files/images/smilies/kiss.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/kiss_emojione.png b/wcfsetup/install/files/images/smilies/kiss_emojione.png
new file mode 100644 (file)
index 0000000..0ff808f
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/kiss_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/love.png b/wcfsetup/install/files/images/smilies/love.png
deleted file mode 100644 (file)
index aa9dd52..0000000
Binary files a/wcfsetup/install/files/images/smilies/love.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/love_emojione.png b/wcfsetup/install/files/images/smilies/love_emojione.png
new file mode 100644 (file)
index 0000000..73fbee2
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/love_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/mellow.png b/wcfsetup/install/files/images/smilies/mellow.png
deleted file mode 100644 (file)
index 78c4c9f..0000000
Binary files a/wcfsetup/install/files/images/smilies/mellow.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/mellow_emojione.png b/wcfsetup/install/files/images/smilies/mellow_emojione.png
new file mode 100644 (file)
index 0000000..065d193
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/mellow_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/pinch.png b/wcfsetup/install/files/images/smilies/pinch.png
deleted file mode 100644 (file)
index 171f28a..0000000
Binary files a/wcfsetup/install/files/images/smilies/pinch.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/pinch_emojione.png b/wcfsetup/install/files/images/smilies/pinch_emojione.png
new file mode 100644 (file)
index 0000000..2954017
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/pinch_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/question.png b/wcfsetup/install/files/images/smilies/question.png
deleted file mode 100644 (file)
index 95bd6cb..0000000
Binary files a/wcfsetup/install/files/images/smilies/question.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/question_emojione.png b/wcfsetup/install/files/images/smilies/question_emojione.png
new file mode 100644 (file)
index 0000000..5a58f34
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/question_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/rolleyes.png b/wcfsetup/install/files/images/smilies/rolleyes.png
deleted file mode 100644 (file)
index 2e68be7..0000000
Binary files a/wcfsetup/install/files/images/smilies/rolleyes.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/rolleyes_emojione.png b/wcfsetup/install/files/images/smilies/rolleyes_emojione.png
new file mode 100644 (file)
index 0000000..2f77b9f
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/rolleyes_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/sad.png b/wcfsetup/install/files/images/smilies/sad.png
deleted file mode 100644 (file)
index 17f9feb..0000000
Binary files a/wcfsetup/install/files/images/smilies/sad.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/sad_emojione.png b/wcfsetup/install/files/images/smilies/sad_emojione.png
new file mode 100644 (file)
index 0000000..6ae71f2
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/sad_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/saint.png b/wcfsetup/install/files/images/smilies/saint.png
deleted file mode 100644 (file)
index f5fc8cc..0000000
Binary files a/wcfsetup/install/files/images/smilies/saint.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/saint_emojione.png b/wcfsetup/install/files/images/smilies/saint_emojione.png
new file mode 100644 (file)
index 0000000..57f5151
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/saint_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/scared.png b/wcfsetup/install/files/images/smilies/scared.png
deleted file mode 100644 (file)
index 62a6cae..0000000
Binary files a/wcfsetup/install/files/images/smilies/scared.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/scared_emojione.png b/wcfsetup/install/files/images/smilies/scared_emojione.png
new file mode 100644 (file)
index 0000000..eb8b347
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/scared_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/sick.png b/wcfsetup/install/files/images/smilies/sick.png
deleted file mode 100644 (file)
index 2ef69f5..0000000
Binary files a/wcfsetup/install/files/images/smilies/sick.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/sick_emojione.png b/wcfsetup/install/files/images/smilies/sick_emojione.png
new file mode 100644 (file)
index 0000000..a566c10
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/sick_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/sleeping.png b/wcfsetup/install/files/images/smilies/sleeping.png
deleted file mode 100644 (file)
index 59897d1..0000000
Binary files a/wcfsetup/install/files/images/smilies/sleeping.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/sleeping_emojione.png b/wcfsetup/install/files/images/smilies/sleeping_emojione.png
new file mode 100644 (file)
index 0000000..9ecf600
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/sleeping_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/smile.png b/wcfsetup/install/files/images/smilies/smile.png
deleted file mode 100644 (file)
index 34e0a9c..0000000
Binary files a/wcfsetup/install/files/images/smilies/smile.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/smile_emojione.png b/wcfsetup/install/files/images/smilies/smile_emojione.png
new file mode 100644 (file)
index 0000000..e9e53c0
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/smile_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/thumbdown.png b/wcfsetup/install/files/images/smilies/thumbdown.png
deleted file mode 100644 (file)
index b46bc4a..0000000
Binary files a/wcfsetup/install/files/images/smilies/thumbdown.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/thumbdown_emojione.png b/wcfsetup/install/files/images/smilies/thumbdown_emojione.png
new file mode 100644 (file)
index 0000000..b63da2f
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/thumbdown_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/thumbsup.png b/wcfsetup/install/files/images/smilies/thumbsup.png
deleted file mode 100644 (file)
index 6f64862..0000000
Binary files a/wcfsetup/install/files/images/smilies/thumbsup.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/thumbsup_emojione.png b/wcfsetup/install/files/images/smilies/thumbsup_emojione.png
new file mode 100644 (file)
index 0000000..5bba6dc
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/thumbsup_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/thumbup.png b/wcfsetup/install/files/images/smilies/thumbup.png
deleted file mode 100644 (file)
index 1ac0eb1..0000000
Binary files a/wcfsetup/install/files/images/smilies/thumbup.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/thumbup_emojione.png b/wcfsetup/install/files/images/smilies/thumbup_emojione.png
new file mode 100644 (file)
index 0000000..f9e6f13
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/thumbup_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/tired.png b/wcfsetup/install/files/images/smilies/tired.png
deleted file mode 100644 (file)
index cf463ec..0000000
Binary files a/wcfsetup/install/files/images/smilies/tired.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/tired_emojione.png b/wcfsetup/install/files/images/smilies/tired_emojione.png
new file mode 100644 (file)
index 0000000..490fb56
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/tired_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/tongue.png b/wcfsetup/install/files/images/smilies/tongue.png
deleted file mode 100644 (file)
index 68f91ab..0000000
Binary files a/wcfsetup/install/files/images/smilies/tongue.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/tongue_emojione.png b/wcfsetup/install/files/images/smilies/tongue_emojione.png
new file mode 100644 (file)
index 0000000..2575734
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/tongue_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/unsure.png b/wcfsetup/install/files/images/smilies/unsure.png
deleted file mode 100644 (file)
index 2abb2be..0000000
Binary files a/wcfsetup/install/files/images/smilies/unsure.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/unsure_emojione.png b/wcfsetup/install/files/images/smilies/unsure_emojione.png
new file mode 100644 (file)
index 0000000..7074afc
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/unsure_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/w00t.png b/wcfsetup/install/files/images/smilies/w00t.png
deleted file mode 100644 (file)
index 4a129ca..0000000
Binary files a/wcfsetup/install/files/images/smilies/w00t.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/w00t_emojione.png b/wcfsetup/install/files/images/smilies/w00t_emojione.png
new file mode 100644 (file)
index 0000000..c3bea9f
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/w00t_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/wacko.png b/wcfsetup/install/files/images/smilies/wacko.png
deleted file mode 100644 (file)
index a30bdf4..0000000
Binary files a/wcfsetup/install/files/images/smilies/wacko.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/wacko_emojione.png b/wcfsetup/install/files/images/smilies/wacko_emojione.png
new file mode 100644 (file)
index 0000000..f0dae7b
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/wacko_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/whistling.png b/wcfsetup/install/files/images/smilies/whistling.png
deleted file mode 100644 (file)
index f70f532..0000000
Binary files a/wcfsetup/install/files/images/smilies/whistling.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/whistling_emojione.png b/wcfsetup/install/files/images/smilies/whistling_emojione.png
new file mode 100644 (file)
index 0000000..39d325f
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/whistling_emojione.png differ

diff --git a/wcfsetup/install/files/images/smilies/wink.png b/wcfsetup/install/files/images/smilies/wink.png
deleted file mode 100644 (file)
index 87ebba3..0000000
Binary files a/wcfsetup/install/files/images/smilies/wink.png and /dev/null differ

diff --git a/wcfsetup/install/files/images/smilies/wink_emojione.png b/wcfsetup/install/files/images/smilies/wink_emojione.png
new file mode 100644 (file)
index 0000000..7ea7810
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/wink_emojione.png differ

diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss
index e45282a7c8f6f8b208cab609f47ae0a12d6676af..b3dbbec6f095cc09992b72e62dcc6456de706bff 100644 (file)
--- a/wcfsetup/install/files/style/ui/redactor.scss
+++ b/wcfsetup/install/files/style/ui/redactor.scss
@@ -500,10 +500,24 @@
        margin: 0 0 20px 20px;
 }
 
+.smiley,
+.jsSmiley > img {
+       &[src$="_emojione.png"] {
+               max-height: 20px;
+       }
+}
+
 .smiley {
        margin: 0 1px;
 }
 
+@include screen-md-down {
+       .jsSmiley {
+               display: inline-block;
+               padding: 10px;
+       }
+}
+
 .wysiwygTextarea {
        background-color: transparent !important;
        border: 1px solid $wcfContentBorderInner !important;

diff --git a/wcfsetup/install/files/tmp/.htaccess b/wcfsetup/install/files/tmp/.htaccess
new file mode 100644 (file)
index 0000000..3418e55
--- /dev/null
+++ b/wcfsetup/install/files/tmp/.htaccess
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file