Adding Emoji One

rebase/4.0.0rc2
Eugen Rochko 2016-11-08 21:45:51 +01:00
parent b6832553ff
commit 86574ea524
1837 changed files with 34 additions and 3 deletions

View File

@ -1,5 +1,10 @@
import ImmutablePropTypes from 'react-immutable-proptypes'; 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({ const StatusContent = React.createClass({
@ -55,7 +60,7 @@ const StatusContent = React.createClass({
}, },
render () { 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} />; return <div className='status__content' dangerouslySetInnerHTML={content} />;
}, },

View File

@ -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 { .status__content, .reply-indicator__content {
font-size: 15px; font-size: 15px;
line-height: 20px; line-height: 20px;
@ -78,6 +89,11 @@
font-weight: 300; font-weight: 300;
overflow: hidden; overflow: hidden;
.emojione {
width: 18px;
height: 18px;
}
p { p {
margin-bottom: 20px; margin-bottom: 20px;
@ -110,6 +126,11 @@
.status__content { .status__content {
font-size: 19px; font-size: 19px;
line-height: 24px; line-height: 24px;
.emojione {
width: 22px;
height: 22px;
}
} }
} }

View File

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

View File

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

BIN
public/emoji/0023-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

BIN
public/emoji/0023.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 634 B

BIN
public/emoji/002a-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

BIN
public/emoji/002a.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 645 B

BIN
public/emoji/0030-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

BIN
public/emoji/0030.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

BIN
public/emoji/0031-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

BIN
public/emoji/0031.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

BIN
public/emoji/0032-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 567 B

BIN
public/emoji/0032.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

BIN
public/emoji/0033-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 B

BIN
public/emoji/0033.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

BIN
public/emoji/0034-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

BIN
public/emoji/0034.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 542 B

BIN
public/emoji/0035-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

BIN
public/emoji/0035.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

BIN
public/emoji/0036-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 612 B

BIN
public/emoji/0036.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

BIN
public/emoji/0037-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

BIN
public/emoji/0037.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 559 B

BIN
public/emoji/0038-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

BIN
public/emoji/0038.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

BIN
public/emoji/0039-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 B

BIN
public/emoji/0039.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 B

BIN
public/emoji/00a9.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 B

BIN
public/emoji/00ae.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

BIN
public/emoji/1f004.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 951 B

BIN
public/emoji/1f0cf.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/emoji/1f170.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

BIN
public/emoji/1f171.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

BIN
public/emoji/1f17e.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

BIN
public/emoji/1f17f.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

BIN
public/emoji/1f18e.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

BIN
public/emoji/1f191.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

BIN
public/emoji/1f192.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

BIN
public/emoji/1f193.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

BIN
public/emoji/1f194.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

BIN
public/emoji/1f195.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 B

BIN
public/emoji/1f196.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

BIN
public/emoji/1f197.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

BIN
public/emoji/1f198.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

BIN
public/emoji/1f199.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

BIN
public/emoji/1f19a.png Normal file

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

BIN
public/emoji/1f1e6.png Normal file

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

BIN
public/emoji/1f1e7.png Normal file

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