mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 09:36:19 -05:00
Add slightly_smiling
emoji and use it as default smile.
This commit is contained in:
parent
faaafe2163
commit
3095dd160e
8 changed files with 16 additions and 4 deletions
|
@ -273,7 +273,7 @@ export default Ember.Component.extend({
|
|||
term = term.toLowerCase();
|
||||
|
||||
if (term === "") {
|
||||
return resolve(["smile", "smiley", "wink", "sunny", "blush"]);
|
||||
return resolve(["slightly_smiling", "smile", "wink", "sunny", "blush"]);
|
||||
}
|
||||
|
||||
if (Discourse.Emoji.translations[full]) {
|
||||
|
|
|
@ -6,7 +6,7 @@ const groups = [
|
|||
name: "people",
|
||||
fullname: "People",
|
||||
tabicon: "grinning",
|
||||
icons: ["grinning", "grin", "joy", "smiley", "smile", "sweat_smile", "laughing", "innocent", "smiling_imp", "imp", "wink", "blush", "relaxed", "yum", "relieved", "heart_eyes", "sunglasses", "smirk", "neutral_face", "expressionless", "unamused", "sweat", "pensive", "confused", "confounded", "kissing", "kissing_heart", "kissing_smiling_eyes", "kissing_closed_eyes", "stuck_out_tongue", "stuck_out_tongue_winking_eye", "stuck_out_tongue_closed_eyes", "disappointed", "worried", "angry", "rage", "cry", "persevere", "triumph", "disappointed_relieved", "frowning", "anguished", "fearful", "weary", "sleepy", "tired_face", "grimacing", "sob", "open_mouth", "hushed", "cold_sweat", "scream", "astonished", "flushed", "sleeping", "dizzy_face", "no_mouth", "mask", "smile_cat", "joy_cat", "smiley_cat", "heart_eyes_cat", "smirk_cat", "kissing_cat", "pouting_cat", "crying_cat_face", "scream_cat", "footprints", "bust_in_silhouette", "busts_in_silhouette", "baby", "boy", "girl", "man", "woman", "family", "couple", "two_men_holding_hands", "two_women_holding_hands", "dancers", "bride_with_veil", "person_with_blond_hair", "man_with_gua_pi_mao", "man_with_turban", "older_man", "older_woman", "cop", "construction_worker", "princess", "guardsman", "angel", "santa", "ghost", "japanese_ogre", "japanese_goblin", "hankey", "skull", "alien", "space_invader", "bow", "information_desk_person", "no_good", "ok_woman", "raising_hand", "person_with_pouting_face", "person_frowning", "massage", "haircut", "couple_with_heart", "couplekiss", "raised_hands", "clap", "hand", "ear", "eyes", "nose", "lips", "kiss", "tongue", "nail_care", "wave", "+1", "-1", "point_up", "point_up_2", "point_down", "point_left", "point_right", "ok_hand", "v", "facepunch", "fist", "raised_hand", "muscle", "open_hands", "pray"]
|
||||
icons: ["slightly_smiling", "grinning", "grin", "joy", "smiley", "smile", "sweat_smile", "laughing", "innocent", "smiling_imp", "imp", "wink", "blush", "relaxed", "yum", "relieved", "heart_eyes", "sunglasses", "smirk", "neutral_face", "expressionless", "unamused", "sweat", "pensive", "confused", "confounded", "kissing", "kissing_heart", "kissing_smiling_eyes", "kissing_closed_eyes", "stuck_out_tongue", "stuck_out_tongue_winking_eye", "stuck_out_tongue_closed_eyes", "disappointed", "worried", "angry", "rage", "cry", "persevere", "triumph", "disappointed_relieved", "frowning", "anguished", "fearful", "weary", "sleepy", "tired_face", "grimacing", "sob", "open_mouth", "hushed", "cold_sweat", "scream", "astonished", "flushed", "sleeping", "dizzy_face", "no_mouth", "mask", "smile_cat", "joy_cat", "smiley_cat", "heart_eyes_cat", "smirk_cat", "kissing_cat", "pouting_cat", "crying_cat_face", "scream_cat", "footprints", "bust_in_silhouette", "busts_in_silhouette", "baby", "boy", "girl", "man", "woman", "family", "couple", "two_men_holding_hands", "two_women_holding_hands", "dancers", "bride_with_veil", "person_with_blond_hair", "man_with_gua_pi_mao", "man_with_turban", "older_man", "older_woman", "cop", "construction_worker", "princess", "guardsman", "angel", "santa", "ghost", "japanese_ogre", "japanese_goblin", "hankey", "skull", "alien", "space_invader", "bow", "information_desk_person", "no_good", "ok_woman", "raising_hand", "person_with_pouting_face", "person_frowning", "massage", "haircut", "couple_with_heart", "couplekiss", "raised_hands", "clap", "hand", "ear", "eyes", "nose", "lips", "kiss", "tongue", "nail_care", "wave", "+1", "-1", "point_up", "point_up_2", "point_down", "point_left", "point_right", "ok_hand", "v", "facepunch", "fist", "raised_hand", "muscle", "open_hands", "pray"]
|
||||
},
|
||||
{
|
||||
name: "nature",
|
||||
|
|
|
@ -99,8 +99,8 @@ function imageFor(code) {
|
|||
|
||||
// Also support default emotions
|
||||
var translations = {
|
||||
':)' : 'smile',
|
||||
':-)' : 'smile',
|
||||
':)' : 'slightly_smiling',
|
||||
':-)' : 'slightly_smiling',
|
||||
':(' : 'frowning',
|
||||
':-(' : 'frowning',
|
||||
';)' : 'wink',
|
||||
|
|
|
@ -1,5 +1,17 @@
|
|||
[
|
||||
{
|
||||
"emoji": "🙂"
|
||||
, "description": "slightly smiling face with closed mouth and smiling eyes"
|
||||
, "aliases": [
|
||||
"slightly_smiling"
|
||||
]
|
||||
, "tags": [
|
||||
"happy"
|
||||
, "joy"
|
||||
, "pleased"
|
||||
]
|
||||
}
|
||||
, {
|
||||
"emoji": "😄"
|
||||
, "description": "smiling face with open mouth and smiling eyes"
|
||||
, "aliases": [
|
||||
|
|
BIN
public/images/emoji/apple/slightly_smiling.png
Normal file
BIN
public/images/emoji/apple/slightly_smiling.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.7 KiB |
BIN
public/images/emoji/emoji_one/slightly_smiling.png
Normal file
BIN
public/images/emoji/emoji_one/slightly_smiling.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 914 B |
BIN
public/images/emoji/google/slightly_smiling.png
Normal file
BIN
public/images/emoji/google/slightly_smiling.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.8 KiB |
BIN
public/images/emoji/twitter/slightly_smiling.png
Normal file
BIN
public/images/emoji/twitter/slightly_smiling.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 815 B |
Loading…
Reference in a new issue