Skip to content

Loading…

Added missing emoji #60

Merged
merged 2 commits into from

6 participants

@asianmack

Added:

:grinning:
:kissing:
:kissing_smiling_eyes:
:stuck_out_tongue:
:sleeping:
:worried:
:frowning:
:anguished:
:open_mouth:
:grimacing:
:confused:
:hushed:
:expressionless:
:sparkling_heart:
:hourglass_flowing_sand:
:house_with_garden:
:white_check_mark:
:black_square_button:
:white_square_button:

Renamed:

:kissing_face: => :kissing_closed_eyes:
:tongue: => : :stuck_out_tongue_closed_eyes.png:
:tongue2: => :tongue:

@arvida
Owner

Great! :+1:

Doesn't look to be working on github yet, I guess these will be added to github also?

ping @micho @jkupferman @pykler

@josh

Woah, woah, give me like 5 mins to deploy! :smile:

@asianmack

@arvida Yes that's right. Just added late last night.

Campfire and New Basecamp have been updated.

@arvida
Owner

:laughing:

@josh

@arvida you know about github/gemoji right?

@arvida
Owner

Yeah, gemoji looks sweet. Was thinking that it would be cool if the cheat sheet could use gemoji as source. I think the categorization is the only thing that I need to figure out to make that work.

@josh

@arvida I think we're going to add some sort of categorization system into gemoji.

@arvida
Owner

:+1: Let me know if it happens and ill start to use it as source

@arvida arvida merged commit 165bb34 into arvida:master
@arvida
Owner

@josh I guess it would be pretty easy to add to gemoji, just categorizing the image files into a folder structure and then add a new method to Emoji that returns a hash where the keys are the :-code and values are the path. I guess the problem is making it compatible with the current version as it will have a new folder structure.

~~I can take a look at it if you think that it sounds like a good idea. ~~


When thinking about it a bit: might not be such a good idea to automatically import the emojis, this will break the current grouping on the cheat sheet. Got to think a bit more on this :smile:

@arvida
Owner

:boom: ... and its deployed.

@micho

Awesome! Teambox updated, new release going out on Monday. :dancers:

@trevorturk

Something is fishy here -- a hard-refresh shows a turkey leg as a purse for me... am I the only one?

@arvida
Owner

Nope, I am checking it out now

@arvida
Owner

Should be fixed now. It was the cdn :cry:

Need to automate the deploys better..

@trevorturk
@arvida
Owner

:point_right: On deploy I generate a sprite from the emoji image files and a css for that sprite. The cheat sheet is hosted on S3 via CloudFront. The CF invalidation is done manually right now, and I must have typed the name of the stylesheet wrong when invalidating :neckbeard: Gonna add some automatic invalidation to the deploy script.

@jkupferman

:white_check_mark: Live on @turntablefm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 25, 2012
  1. @asianmack

    added new emoji assets

    asianmack committed
  2. @asianmack

    added missing emoji

    asianmack committed
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
BIN public/graphics/emojis/stuck_out_tongue_closed_eyes.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/graphics/emojis/stuck_out_tongue_winking_eye.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN 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.
View
BIN public/graphics/emojis/tongue2.png
Deleted file not rendered
View
BIN 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.
View
BIN 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.
View
BIN 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.
View
26 public/index.html
@@ -44,14 +44,28 @@
<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>
@@ -94,6 +108,7 @@
<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>
@@ -195,7 +210,7 @@
<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>
@@ -377,6 +392,7 @@
<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>
@@ -596,6 +612,7 @@
<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>
@@ -883,6 +900,9 @@
<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>
Something went wrong with that request. Please try again.