Skip to content

Commit

Permalink
Merge pull request #60 from asianmack/master
Browse files Browse the repository at this point in the history
Added missing emoji
  • Loading branch information
arvida committed Oct 25, 2012
2 parents 489af53 + 6140086 commit 165bb34
Show file tree
Hide file tree
Showing 26 changed files with 23 additions and 3 deletions.
Binary file added public/graphics/emojis/anguished.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/bee.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/black_square_button.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/confused.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/expressionless.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/frowning.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/grimacing.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/grinning.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/hourglass_flowing_sand.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/house_with_garden.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/hushed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/kissing.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/kissing_closed_eyes.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/kissing_smiling_eyes.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/open_mouth.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/sleeping.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/sparkling_heart.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/stuck_out_tongue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/graphics/emojis/tongue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/graphics/emojis/tongue2.png
Binary file not shown.
Binary file added public/graphics/emojis/white_check_mark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/white_square_button.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphics/emojis/worried.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 23 additions & 3 deletions public/index.html
Expand Up @@ -44,14 +44,28 @@ <h2>People</h2>
<li><div><img src="graphics/emojis/smirk.png"> :smirk:</div></li>
<li><div><img src="graphics/emojis/heart_eyes.png"> :heart_eyes:</div></li>
<li><div><img src="graphics/emojis/kissing_heart.png"> :kissing_heart:</div></li>
<li><div><img src="graphics/emojis/kissing_face.png"> :kissing_face:</div></li>
<li><div><img src="graphics/emojis/kissing_closed_eyes.png"> :kissing_closed_eyes:</div></li>
<li><div><img src="graphics/emojis/flushed.png"> :flushed:</div></li>
<li><div><img src="graphics/emojis/relieved.png"> :relieved:</div></li>
<li><div><img src="graphics/emojis/satisfied.png"> :satisfied:</div></li>
<li><div><img src="graphics/emojis/grin.png"> :grin:</div></li>
<li><div><img src="graphics/emojis/wink.png"> :wink:</div></li>
<li><div><img src="graphics/emojis/wink2.png"> :wink2:</div></li>
<li><div><img src="graphics/emojis/tongue.png"> :tongue:</div></li>
<li><div><img src="graphics/emojis/stuck_out_tongue_winking_eye.png"> :stuck_out_tongue_winking_eye:</div></li>
<li><div><img src="graphics/emojis/stuck_out_tongue_closed_eyes.png"> :stuck_out_tongue_closed_eyes:</div></li>
<li><div><img src="graphics/emojis/grinning.png"> :grinning:</div></li>
<li><div><img src="graphics/emojis/kissing.png"> :kissing:</div></li>
<li><div><img src="graphics/emojis/kissing_smiling_eyes.png"> :kissing_smiling_eyes:</div></li>
<li><div><img src="graphics/emojis/stuck_out_tongue.png"> :stuck_out_tongue:</div></li>
<li><div><img src="graphics/emojis/sleeping.png"> :sleeping:</div></li>
<li><div><img src="graphics/emojis/worried.png"> :worried:</div></li>
<li><div><img src="graphics/emojis/frowning.png"> :frowning:</div></li>
<li><div><img src="graphics/emojis/anguished.png"> :anguished:</div></li>
<li><div><img src="graphics/emojis/open_mouth.png"> :open_mouth:</div></li>
<li><div><img src="graphics/emojis/grimacing.png"> :grimacing:</div></li>
<li><div><img src="graphics/emojis/confused.png"> :confused:</div></li>
<li><div><img src="graphics/emojis/hushed.png"> :hushed:</div></li>
<li><div><img src="graphics/emojis/expressionless.png"> :expressionless:</div></li>
<li><div><img src="graphics/emojis/unamused.png"> :unamused:</div></li>
<li><div><img src="graphics/emojis/sweat_smile.png"> :sweat_smile:</div></li>
<li><div><img src="graphics/emojis/sweat.png"> :sweat:</div></li>
Expand Down Expand Up @@ -94,6 +108,7 @@ <h2>People</h2>
<li><div><img src="graphics/emojis/two_hearts.png"> :two_hearts:</div></li>
<li><div><img src="graphics/emojis/revolving_hearts.png"> :revolving_hearts:</div></li>
<li><div><img src="graphics/emojis/cupid.png"> :cupid:</div></li>
<li><div><img src="graphics/emojis/sparkling_heart.png"> :sparkling_heart:</div></li>
<li><div><img src="graphics/emojis/sparkles.png"> :sparkles:</div></li>
<li><div><img src="graphics/emojis/star.png"> :star:</div></li>
<li><div><img src="graphics/emojis/star2.png"> :star2:</div></li>
Expand Down Expand Up @@ -195,7 +210,7 @@ <h2>People</h2>
<li><div><img src="graphics/emojis/ear.png"> :ear:</div></li>
<li><div><img src="graphics/emojis/eyes.png"> :eyes:</div></li>
<li><div><img src="graphics/emojis/nose.png"> :nose:</div></li>
<li><div><img src="graphics/emojis/tongue2.png"> :tongue2:</div></li>
<li><div><img src="graphics/emojis/tongue.png"> :tongue:</div></li>
<li><div><img src="graphics/emojis/love_letter.png"> :love_letter:</div></li>
<li><div><img src="graphics/emojis/bust_in_silhouette.png"> :bust_in_silhouette:</div></li>
<li><div><img src="graphics/emojis/busts_in_silhouette.png"> :busts_in_silhouette:</div></li>
Expand Down Expand Up @@ -377,6 +392,7 @@ <h2>Objects</h2>
<li><div><img src="graphics/emojis/loudspeaker.png"> :loudspeaker:</div></li>
<li><div><img src="graphics/emojis/mega.png"> :mega:</div></li>
<li><div><img src="graphics/emojis/hourglass.png"> :hourglass:</div></li>
<li><div><img src="graphics/emojis/hourglass_flowing_sand.png"> :hourglass_flowing_sand:</div></li>
<li><div><img src="graphics/emojis/alarm_clock.png"> :alarm_clock:</div></li>
<li><div><img src="graphics/emojis/watch.png"> :watch:</div></li>
<li><div><img src="graphics/emojis/radio.png"> :radio:</div></li>
Expand Down Expand Up @@ -596,6 +612,7 @@ <h2>Places</h2>
<ul id="emoji-places">
<li><div><img src="graphics/emojis/109.png"> :109:</div></li>
<li><div><img src="graphics/emojis/house.png"> :house:</div></li>
<li><div><img src="graphics/emojis/house_with_garden.png"> :house_with_garden:</div></li>
<li><div><img src="graphics/emojis/school.png"> :school:</div></li>
<li><div><img src="graphics/emojis/office.png"> :office:</div></li>
<li><div><img src="graphics/emojis/post_office.png"> :post_office:</div></li>
Expand Down Expand Up @@ -883,6 +900,9 @@ <h2>Symbols</h2>
<li><div><img src="graphics/emojis/trident.png"> :trident:</div></li>
<li><div><img src="graphics/emojis/black_square.png"> :black_square:</div></li>
<li><div><img src="graphics/emojis/white_square.png"> :white_square:</div></li>
<li><div><img src="graphics/emojis/white_check_mark.png"> :white_check_mark:</div></li>
<li><div><img src="graphics/emojis/black_square_button.png"> :black_square_button:</div></li>
<li><div><img src="graphics/emojis/white_square_button.png"> :white_square_button:</div></li>
<li><div><img src="graphics/emojis/black_circle.png"> :black_circle:</div></li>
<li><div><img src="graphics/emojis/white_circle.png"> :white_circle:</div></li>
<li><div><img src="graphics/emojis/red_circle.png"> :red_circle:</div></li>
Expand Down

0 comments on commit 165bb34

Please sign in to comment.