Revert "Merge branch 'develop' into 'origin'"

This reverts commit e1922bd555.
This commit is contained in:
harukin
2019-12-29 13:31:01 +09:00
parent e1922bd555
commit bbcc9fe8d8
41 changed files with 5 additions and 3616 deletions

View File

@@ -1300,11 +1300,7 @@ function list_smilies($default_only = false) {
':coffee',
':facepalm',
':like',
':dislike',
':harukin:',
':archlinux:',
'欲しい!!',
'5000兆円'
':dislike'
);
$icons = array(
@@ -1338,11 +1334,7 @@ function list_smilies($default_only = false) {
'<img class="smiley" src="' . z_root() . '/images/emoticons/coffee.gif" alt=":coffee" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-facepalm.gif" alt=":facepalm" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/like.gif" alt=":like" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/harukin.png" alt=":harukin:" height="17em" width="auto" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/archlinux.png" alt=":archlinux:" height="17em" width="auto" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/欲しい!!.png" alt="欲しい!!" height="50em" width="auto" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/5000兆円.png" alt="5000兆円" height="50em" width="auto" />'
'<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />'
);