Adding Emoji One

master
Eugen Rochko 8 years ago
parent b6832553ff
commit 86574ea524
  1. 9
      app/assets/javascripts/components/components/status_content.jsx
  2. 21
      app/assets/stylesheets/components.scss
  3. 2
      config/initializers/assets.rb
  4. 1
      package.json
  5. BIN
      public/emoji/0023-20e3.png
  6. BIN
      public/emoji/0023.png
  7. BIN
      public/emoji/002a-20e3.png
  8. BIN
      public/emoji/002a.png
  9. BIN
      public/emoji/0030-20e3.png
  10. BIN
      public/emoji/0030.png
  11. BIN
      public/emoji/0031-20e3.png
  12. BIN
      public/emoji/0031.png
  13. BIN
      public/emoji/0032-20e3.png
  14. BIN
      public/emoji/0032.png
  15. BIN
      public/emoji/0033-20e3.png
  16. BIN
      public/emoji/0033.png
  17. BIN
      public/emoji/0034-20e3.png
  18. BIN
      public/emoji/0034.png
  19. BIN
      public/emoji/0035-20e3.png
  20. BIN
      public/emoji/0035.png
  21. BIN
      public/emoji/0036-20e3.png
  22. BIN
      public/emoji/0036.png
  23. BIN
      public/emoji/0037-20e3.png
  24. BIN
      public/emoji/0037.png
  25. BIN
      public/emoji/0038-20e3.png
  26. BIN
      public/emoji/0038.png
  27. BIN
      public/emoji/0039-20e3.png
  28. BIN
      public/emoji/0039.png
  29. BIN
      public/emoji/00a9.png
  30. BIN
      public/emoji/00ae.png
  31. BIN
      public/emoji/1f004.png
  32. BIN
      public/emoji/1f0cf.png
  33. BIN
      public/emoji/1f170.png
  34. BIN
      public/emoji/1f171.png
  35. BIN
      public/emoji/1f17e.png
  36. BIN
      public/emoji/1f17f.png
  37. BIN
      public/emoji/1f18e.png
  38. BIN
      public/emoji/1f191.png
  39. BIN
      public/emoji/1f192.png
  40. BIN
      public/emoji/1f193.png
  41. BIN
      public/emoji/1f194.png
  42. BIN
      public/emoji/1f195.png
  43. BIN
      public/emoji/1f196.png
  44. BIN
      public/emoji/1f197.png
  45. BIN
      public/emoji/1f198.png
  46. BIN
      public/emoji/1f199.png
  47. BIN
      public/emoji/1f19a.png
  48. BIN
      public/emoji/1f1e6-1f1e8.png
  49. BIN
      public/emoji/1f1e6-1f1e9.png
  50. BIN
      public/emoji/1f1e6-1f1ea.png
  51. BIN
      public/emoji/1f1e6-1f1eb.png
  52. BIN
      public/emoji/1f1e6-1f1ec.png
  53. BIN
      public/emoji/1f1e6-1f1ee.png
  54. BIN
      public/emoji/1f1e6-1f1f1.png
  55. BIN
      public/emoji/1f1e6-1f1f2.png
  56. BIN
      public/emoji/1f1e6-1f1f4.png
  57. BIN
      public/emoji/1f1e6-1f1f6.png
  58. BIN
      public/emoji/1f1e6-1f1f7.png
  59. BIN
      public/emoji/1f1e6-1f1f8.png
  60. BIN
      public/emoji/1f1e6-1f1f9.png
  61. BIN
      public/emoji/1f1e6-1f1fa.png
  62. BIN
      public/emoji/1f1e6-1f1fc.png
  63. BIN
      public/emoji/1f1e6-1f1fd.png
  64. BIN
      public/emoji/1f1e6-1f1ff.png
  65. BIN
      public/emoji/1f1e6.png
  66. BIN
      public/emoji/1f1e7-1f1e6.png
  67. BIN
      public/emoji/1f1e7-1f1e7.png
  68. BIN
      public/emoji/1f1e7-1f1e9.png
  69. BIN
      public/emoji/1f1e7-1f1ea.png
  70. BIN
      public/emoji/1f1e7-1f1eb.png
  71. BIN
      public/emoji/1f1e7-1f1ec.png
  72. BIN
      public/emoji/1f1e7-1f1ed.png
  73. BIN
      public/emoji/1f1e7-1f1ee.png
  74. BIN
      public/emoji/1f1e7-1f1ef.png
  75. BIN
      public/emoji/1f1e7-1f1f1.png
  76. BIN
      public/emoji/1f1e7-1f1f2.png
  77. BIN
      public/emoji/1f1e7-1f1f3.png
  78. BIN
      public/emoji/1f1e7-1f1f4.png
  79. BIN
      public/emoji/1f1e7-1f1f6.png
  80. BIN
      public/emoji/1f1e7-1f1f7.png
  81. BIN
      public/emoji/1f1e7-1f1f8.png
  82. BIN
      public/emoji/1f1e7-1f1f9.png
  83. BIN
      public/emoji/1f1e7-1f1fb.png
  84. BIN
      public/emoji/1f1e7-1f1fc.png
  85. BIN
      public/emoji/1f1e7-1f1fe.png
  86. BIN
      public/emoji/1f1e7-1f1ff.png
  87. BIN
      public/emoji/1f1e7.png
  88. BIN
      public/emoji/1f1e8-1f1e6.png
  89. BIN
      public/emoji/1f1e8-1f1e8.png
  90. BIN
      public/emoji/1f1e8-1f1e9.png
  91. BIN
      public/emoji/1f1e8-1f1eb.png
  92. BIN
      public/emoji/1f1e8-1f1ec.png
  93. BIN
      public/emoji/1f1e8-1f1ed.png
  94. BIN
      public/emoji/1f1e8-1f1ee.png
  95. BIN
      public/emoji/1f1e8-1f1f0.png
  96. BIN
      public/emoji/1f1e8-1f1f1.png
  97. BIN
      public/emoji/1f1e8-1f1f2.png
  98. BIN
      public/emoji/1f1e8-1f1f3.png
  99. BIN
      public/emoji/1f1e8-1f1f4.png
  100. BIN
      public/emoji/1f1e8-1f1f5.png
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1,5 +1,10 @@
import ImmutablePropTypes from 'react-immutable-proptypes';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import emojione from 'emojione';
emojione.imageType = 'png';
emojione.sprites = false;
emojione.imagePathPNG = '/emoji/';
const StatusContent = React.createClass({
@ -55,7 +60,7 @@ const StatusContent = React.createClass({
},
render () {
const content = { __html: this.props.status.get('content') };
const content = { __html: emojione.unicodeToImage(this.props.status.get('content')) };
return <div className='status__content' dangerouslySetInnerHTML={content} />;
},

@ -71,6 +71,17 @@
}
}
.emojione {
display: inline-block;
font-size: inherit;
vertical-align: middle;
margin: -.2ex .15em .2ex;
img {
width: auto;
}
}
.status__content, .reply-indicator__content {
font-size: 15px;
line-height: 20px;
@ -78,6 +89,11 @@
font-weight: 300;
overflow: hidden;
.emojione {
width: 18px;
height: 18px;
}
p {
margin-bottom: 20px;
@ -110,6 +126,11 @@
.status__content {
font-size: 19px;
line-height: 24px;
.emojione {
width: 22px;
height: 22px;
}
}
}

@ -4,7 +4,7 @@
Rails.application.config.assets.version = '1.0'
# Add additional assets to the asset load path
# Rails.application.config.assets.paths << Emoji.images_path
# Rails.application.config.assets.paths << 'node_modules'
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.

@ -41,6 +41,7 @@
"sinon": "^1.17.6"
},
"dependencies": {
"emojione": "^2.2.6",
"react-autosuggest": "^7.0.1",
"react-responsive": "^1.1.5",
"react-router-scroll": "^0.3.2"

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 645 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 567 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 951 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 942 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 997 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 975 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 430 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 614 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 848 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 789 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 490 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 444 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 795 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 554 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 495 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 572 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 755 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 851 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 748 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 524 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save