1
0
mirror of https://github.com/twitter/twemoji.git synced 2024-06-15 03:35:16 +00:00
Commit Graph

85 Commits

Author SHA1 Message Date
Andrea Giammarchi
9dcb7942ca Merge pull request #89 from prdolmos/use-consistent-keypad-ten-color
Use the same background color on all keycap digits
2015-06-30 15:16:30 +01:00
Pablo D. Olmos
4bd33b8b6c use the same background color on all keypad digits 2015-06-30 14:52:43 +02:00
WebReflection
e46f00047e fixed the 1f515.svg one 2015-06-29 17:01:40 +01:00
Andrea Giammarchi
99899025a2 Merge pull request #88 from prdolmos/fix-bookmark
[1f516] Remove unnecessary layer
2015-06-29 16:30:49 +01:00
Pablo D. Olmos
e539c88543 [1f516] remove unnecessary layer 2015-06-29 16:10:45 +02:00
Andrea Giammarchi
3c0c13d3a5 excluding nodeType 1 SVG elements too 2015-06-17 10:01:12 +01:00
Andrea Giammarchi
f5ca4f51f9 Merge pull request #85 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-06-11 09:19:49 +02:00
Kevin Kirsche
3ceb8b884d Remove moot version property from bower.json
Per bower/bower.json-spec@a325da3
2015-06-10 20:39:54 -04:00
Andrea Giammarchi
3e21d10e5a updated both package.json annd bower version to 1.4.1 2015-04-23 09:16:04 +01:00
Andrea Giammarchi
517c2ba84e updated bower version 2015-04-23 09:11:11 +01:00
Andrea Giammarchi
695d863b3d Merge pull request #74 from AnSavvides/patch-1
Add cdnjs option too
2015-04-14 12:48:29 +01:00
Andreas Savvides
5a04e248f6 Add cdnjs option too
`cdnjs` is widely used so it's probably a good idea to mention it too for those that have a preference :)
2015-04-13 18:00:09 +01:00
Andrea Giammarchi
398533a464 Merge pull request #73 from twitter/derekmooney-gh-pages
Derekmooney gh pages
2015-04-11 19:18:21 +01:00
Andrea Giammarchi
ca1c298ddd made consistent with already used style 2015-04-11 18:09:02 +01:00
Derek Mooney
226e5ac6d5 Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Conflicts:
	twemoji.min.js
2015-04-11 09:59:11 -04:00
Derek Mooney
5d4f6fabca Finish up attributes 2015-04-11 09:49:52 -04:00
Andrea Giammarchi
b3d9b74ced re-exported 1f601.svg 2015-04-09 17:00:35 +01:00
Andrea Giammarchi
2b569b5f0e Merge pull request #69 from twitter/fix/grinning-teeth
Fix issue with teeth looking offset on grinning face.
2015-04-09 13:43:58 +01:00
Joen Asmussen
9df390aa66 Fix issue with teeth looking offset on grinning face. 2015-04-09 14:34:58 +02:00
Andrea Giammarchi
0520260c3a Merge pull request #67 from twitter/add/missing-emoji-1f641-1f642
Add missing emoji, 1f641 and 1f642 - Please note this is **asssets** only, library needs all PNGs and SVGs to be exported too
2015-04-09 12:32:25 +01:00
Andrea Giammarchi
8e58ae4745 fixed SVG smiles face alignment 2015-04-09 11:57:30 +01:00
Andrea Giammarchi
974c86d072 Merge pull request #66 from twitter/bug/consistent-face-sizes
Make size and position of face emoji more consistent
2015-04-09 11:29:43 +01:00
Joen Asmussen
898d403387 Tweak 1f630 and 1f622
Remove extra teardrop from crying face emoji. Fixes #63

Reposition sweat-drop on face with open mouth and cold sweat emoji. Fixes #61
2015-04-09 12:03:00 +02:00
Andrea Giammarchi
264989b2df removed duplicated viewBox problem with more updated Inkscape 2015-04-09 10:18:05 +01:00
Joen Asmussen
d0e45fee1b Add missing emoji, 1f641 and 1f642
Slightly frowning face and slightly smiling face aren't in the twemoji repo. Here are .ai assets.
2015-04-09 11:07:57 +02:00
Joen Asmussen
18f4beeb76 Make size and position of face emoji more consistent
This pull request starts work on #60. Should it be approved we'd want to export new PNGs and SVGs.

**Observations during work**

All twemoji are drawn on a 38x38 canvas in the .ai source files. All SVGs exported from these .ai files are scaled down to a 24x24px canvas. This explains the weirdly un-rounded size values such as 22,737px in the current SVGs.

Sizing and positioning issues are most noticeable with the "yellow faces". About half the "yellow face" emoji have a head-size of 36x36px inside the 38px canvas, and the other half had a smaller 34x34px head size.

**Specifics for the 1f60a to 1f62f range**

Some of those yellow face emoji are deliberately sized down, so as to make room for artwork. For example "Face With Stuck-Out Tongue And Winking Eye" has a 34x34px head size to allow for the tongue to stick out 2px below. Compare: https://cloudup.com/c0rSvWfAh5i. Since this is a deliberate creative choice, there's nothing to fix here, except push the emoji down 1px.

1f62c had a 34px head size. I compared the eye position with 1f62e and sized up the head of 1f62c. Compare: https://cloudup.com/cD6vRRdaJGJ

**Specifics for the 1f600 to 1f637 range**

There's a fair bit more variance in sizing and positioning of these yellow faces compared to the previous range. Head sizes range from 34px to 36px, and many are off centre. Compare: https://cloudup.com/ckZltnxmCy1

A lot of the smileys in this range almost hug the top of the canvas. I'm tempted to think this may have been in an effort to better align them with text, whose glyphs are traditionally shifted upwards. However since it's not consistent, and the base head size rule is broken often to make room for other creative choices, I think properly centering is probably the more desirable outcome here.

The devil horn smileys are shifted downwards and have 34px base heads, to make room for their horns. There's not much to fix here.

Some of the shades of yellow varied ever so slightly in these emoji. But this could be a creative choice, since some of the "lighter" yellow faces were angry. Such as 1f616 and 1f612.

**Summary and fixes applied**

As a summary, the set is in pretty good shape. Among the problematic yellow-face emoji, some of the nonstandard sizes were a creative choice (devil horns), in those cases I've done nothing.

The two most standard head sizes were 34px and 36px inside the 38px canvas. Specifically in the 1f600 to 1f637 range, it became clear that the 34px head size was both the most flexible (allowed more artwork like hearts and tears to go outside of the base shape), but also the most balanced in eye-to-forehead ratio.

For that reason, I've done the following to standardize:

- In cases where this size was off (such as 36px), I've standardized on the 34px head size
- In cases where emoji were off centre for no seemingly good reason, I've centered them.
- In a very few cases I had to move an eyebrow so as to keep the balanced with the slightly smaller head size, f.x. 1f62f

Where I've performed these fixes I've taken great care in ensuring that eyes, mouth and expressions didn't suddenly fall off the pixel grid, and made sure to compare with eye-sizes of similar emoji.

Here are some before/after's: https://cloudup.com/cCyeVpudNRd
2015-04-09 10:05:44 +02:00
Andrea Giammarchi
990fa702a2 added ex-Twitter under my name 2015-04-08 15:19:38 +01:00
Andrea Giammarchi
5ea434fd0a updated minified version 2015-03-29 17:23:28 +02:00
Andrea Giammarchi
d7388f126d added SELECT to the list of ignored nodes 2015-03-13 10:26:31 +00:00
Andrea Giammarchi
4dd82d4c9e added SELECT to the list of ignored nodes 2015-03-13 10:25:20 +00:00
Andrea Giammarchi
c42a15bca1 modified reset during the loop 2015-03-12 23:30:00 +00:00
Andrea Giammarchi
fe1c85aef0 updated tags 2015-03-12 20:50:22 +00:00
Andrea Giammarchi
92d5bea1ab do not change nodes if not needed 2015-03-12 20:41:20 +00:00
Derek Mooney
1fa5a27fba Remove debugging statement from test 2015-03-01 10:11:46 -05:00
Derek Mooney
3a3efd6063 Update attributes option to only use a callback, more robust html encoding, add tests 2015-03-01 02:07:00 -05:00
Derek Mooney
13eac7a2d8 Add options.attributes callback 2015-02-24 20:05:47 -05:00
Andrea Giammarchi
39a091da4b added TEXTAREA to the ignore list + fixed test for Firefox too 2015-02-16 11:33:43 +00:00
Andrea Giammarchi
1011e6b114 Merge pull request #42 from notlaforge/readme-comment-fix
Fix names of ©, ®, and ™ in code sample comment
2015-02-12 09:23:12 +01:00
Jordi Bunster
23d51907f1 Update README.md
Fix names of ©, ®, and ™ in code sample comment.
2015-02-11 16:01:20 -08:00
Andrea Giammarchi
39ebd1ca2f Merge pull request #37 from unindented/patch-1
Allow for configurable `className`
2015-01-13 22:07:50 +00:00
Daniel Perez Alvarez
e6e5610e5b Allow for configurable className 2015-01-13 16:37:56 +00:00
Andrea Giammarchi
b8a92ab762 Merge pull request #36 from JuanitoFatas/patch-1
Fix GitHub spelling. [ci skip]
2015-01-08 18:53:47 +00:00
Juanito Fatas
3e127f59fc Fix GitHub spelling. [ci skip] 2015-01-09 01:16:23 +08:00
Chris Aniszczyk
9c263d1cf9 Merge pull request #35 from msurguy/patch-1
Typo
2015-01-02 16:06:34 -06:00
Maksim Surguy
1dc4a90c91 Typo
Fixing a typo
2015-01-02 14:04:33 -08:00
Andrea Giammarchi
c23dc3f27d improved the example to exclude ®, © and ™ 2014-12-19 14:56:16 +00:00
Chris Aniszczyk
d82fa62004 Add Tom Wuttke as a maintainer 2014-12-17 09:14:09 -06:00
Andrea Giammarchi
3123cfe176 added extra invariants and invalid chars tests 2014-12-02 17:09:36 +00:00
Andrea Giammarchi
82d698e4ec added more tests for weird graphic cases 2014-12-02 16:52:19 +00:00
Andrea Giammarchi
a467816397 fixed other chars too 2014-12-02 08:18:22 +00:00