Various fixes and improvements to emojification.

- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing

src/component-index.js

@@ -44,7 +44,6 @@ module.exports.components['views.login.VectorLoginFooter'] = require('./componen
 module.exports.components['views.login.VectorLoginHeader'] = require('./components/views/login/VectorLoginHeader');
 module.exports.components['views.messages.DateSeparator'] = require('./components/views/messages/DateSeparator');
 module.exports.components['views.messages.MessageTimestamp'] = require('./components/views/messages/MessageTimestamp');
-module.exports.components['views.messages.SenderProfile'] = require('./components/views/messages/SenderProfile');
 module.exports.components['views.rooms.BottomLeftMenuTile'] = require('./components/views/rooms/BottomLeftMenuTile');
 module.exports.components['views.rooms.MessageContextMenu'] = require('./components/views/rooms/MessageContextMenu');
 module.exports.components['views.rooms.RoomDNDView'] = require('./components/views/rooms/RoomDNDView');

src/components/views/messages/SenderProfile.js

@@ -1,45 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-'use strict';
-
-var React = require('react');
-
-module.exports = React.createClass({
-    displayName: 'SenderProfile',
-
-    propTypes: {
-        mxEvent: React.PropTypes.object.isRequired, // event whose sender we're showing
-        aux: React.PropTypes.string, // stuff to go after the sender name, if anything
-        onClick: React.PropTypes.func,
-    },
-
-    render: function() {
-        var mxEvent = this.props.mxEvent;
-        var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
-
-        var msgtype = mxEvent.getContent().msgtype;
-        if (msgtype && msgtype == 'm.emote') {
-            return <span/>; // emote message must include the name so don't duplicate it
-        }
-        return (
-            <span className="mx_SenderProfile" onClick={this.props.onClick}>
-                {name} { this.props.aux }
-            </span>
-        );
-    },
-});
-

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

@@ -120,8 +120,10 @@ limitations under the License.
 
 /* end of overrides */
 
-.mx_EventTile_bigEmoji {
+/* HACK to override line-height which is already marked important elsewhere */
+.mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
     font-size: 48px ! important;
+    line-height: 48px ! important;
 }
 
 /* this is used for the tile for the event which is selected via the URL.