Skip to content

Commit 43e3662

Browse files
dbkrdbkr
authored
Merge pull request element-hq#1935 from aviraldg/fix-emoji
Various fixes and improvements to emojification.
2 parents dd6868c + 19d5063 commit 43e3662

5 files changed

Lines changed: 13 additions & 52 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/packages/
77
/vector/bundle.*
88
/vector/components.css
9+
/vector/emojione/
910
/vector/config.json
1011
/vector/olm.js
1112
.DS_Store

‎package.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,24 @@
1212
"matrix-react-parent": "matrix-react-sdk",
1313
"scripts": {
1414
"reskindex": "reskindex -h src/header",
15+
"build:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/",
1516
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
1617
"build:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/components.css --no-watch",
1718
"build:compile": "babel --source-maps -d lib src",
1819
"build:bundle": "NODE_ENV=production webpack -p lib/vector/index.js vector/bundle.js",
1920
"build:bundle:dev": "NODE_ENV=production webpack --optimize-occurence-order lib/vector/index.js vector/bundle.js",
2021
"build:staticfiles": "scripts/staticfiles.js",
21-
"build": "npm run build:staticfiles && npm run build:css && npm run build:compile && npm run build:bundle",
22-
"build:dev": "npm run build:staticfiles && npm run build:css && npm run build:compile && npm run build:bundle:dev",
22+
"build": "npm run build:staticfiles && npm run build:emojione && npm run build:css && npm run build:compile && npm run build:bundle",
23+
"build:dev": "npm run build:staticfiles && npm run build:emojione && npm run build:css && npm run build:compile && npm run build:bundle:dev",
2324
"package": "scripts/package.sh",
25+
"start:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/ -w",
2426
"start:js": "webpack -w src/vector/index.js vector/bundle.js",
2527
"start:js:prod": "NODE_ENV=production webpack -w src/vector/index.js vector/bundle.js",
2628
"start:skins:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/components.css",
2729
"//cache": "Note the -c 1 below due to https://code.google.com/p/chromium/issues/detail?id=508270",
28-
"start": "parallelshell \"npm run build:staticfiles\" \"npm run start:js\" \"npm run start:skins:css\" \"http-server -c 1 vector\"",
29-
"start:prod": "parallelshell \"npm run build:staticfiles\" \"npm run start:js:prod\" \"npm run start:skins:css\" \"http-server -c 1 vector\"",
30-
"clean": "rimraf lib vector/olm.js vector/bundle.css vector/bundle.js vector/bundle.js.map vector/webpack.css*",
30+
"start": "parallelshell \"npm run build:staticfiles\" \"npm run start:emojione\" \"npm run start:js\" \"npm run start:skins:css\" \"http-server -c 1 vector\"",
31+
"start:prod": "parallelshell \"npm run build:staticfiles\" \"npm run start:emojione\" \"npm run start:js:prod\" \"npm run start:skins:css\" \"http-server -c 1 vector\"",
32+
"clean": "rimraf lib vector/olm.js vector/bundle.css vector/bundle.js vector/bundle.js.map vector/webpack.css* vector/emojione",
3133
"prepublish": "npm run build:css && npm run build:compile",
3234
"test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false",
3335
"test:multi": "karma start"
@@ -60,7 +62,9 @@
6062
"babel-core": "^5.8.25",
6163
"babel-loader": "^5.3.2",
6264
"catw": "^1.0.1",
65+
"cpx": "^1.3.2",
6366
"css-raw-loader": "^0.1.1",
67+
"emojione": "^2.2.3",
6468
"expect": "^1.16.0",
6569
"fs-extra": "^0.30.0",
6670
"http-server": "^0.8.4",

‎src/component-index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ module.exports.components['views.login.VectorLoginFooter'] = require('./componen
4646
module.exports.components['views.login.VectorLoginHeader'] = require('./components/views/login/VectorLoginHeader');
4747
module.exports.components['views.messages.DateSeparator'] = require('./components/views/messages/DateSeparator');
4848
module.exports.components['views.messages.MessageTimestamp'] = require('./components/views/messages/MessageTimestamp');
49-
module.exports.components['views.messages.SenderProfile'] = require('./components/views/messages/SenderProfile');
5049
module.exports.components['views.rooms.BottomLeftMenuTile'] = require('./components/views/rooms/BottomLeftMenuTile');
5150
module.exports.components['views.rooms.RoomDNDView'] = require('./components/views/rooms/RoomDNDView');
5251
module.exports.components['views.rooms.RoomDropTarget'] = require('./components/views/rooms/RoomDropTarget');

‎src/components/views/messages/SenderProfile.js‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,10 @@ limitations under the License.
120120

121121
/* end of overrides */
122122

123-
.mx_EventTile_bigEmoji {
123+
/* HACK to override line-height which is already marked important elsewhere */
124+
.mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
124125
font-size: 48px ! important;
126+
line-height: 48px ! important;
125127
}
126128

127129
/* this is used for the tile for the event which is selected via the URL.

0 commit comments

Comments
 (0)