mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into skindex-nextgen

Browse source
This commit is contained in:
David Baker 2015-11-30 17:56:40 +00:00
commit cadfbcbed3
8 changed files with 17 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/skins/vector/fonts/OpenSans.css Normal file
View file

@ -0,0 +1,12 @@
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url(u-WUoqrET9fUeobQW7jkRaCWcynf_cDxXwCLxiixG1c.ttf) format('truetype');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(k3k702ZOKiLJc3WVjuplzNqQynqKV_9Plp7mupa0S4g.ttf) format('truetype');
}

BIN
src/skins/vector/fonts/k3k702ZOKiLJc3WVjuplzNqQynqKV_9Plp7mupa0S4g.ttf Normal file
View file

Binary file not shown.

BIN
src/skins/vector/fonts/u-WUoqrET9fUeobQW7jkRaCWcynf_cDxXwCLxiixG1c.ttf Normal file
View file

Binary file not shown.

4
src/skins/vector/views/organisms/Notifier.js
View file

@ -21,9 +21,7 @@ var NotifierController = require('matrix-react-sdk/lib/controllers/organisms/Not
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
var extend = require('matrix-react-sdk/lib/extend');
var dis = require('matrix-react-sdk/lib/dispatcher');
var Avatar = require('../../../../Avatar');
var Avatar = require('matrix-react-sdk/lib/Avatar');
var NotifierView = {
notificationMessageForEvent: function(ev) {

2
src/skins/vector/views/organisms/RoomView.js
View file

@ -109,7 +109,7 @@ module.exports = React.createClass({
render: function() {
var RoomHeader = sdk.getComponent('rooms.RoomHeader');
var MessageComposer = sdk.getComponent('messages.MessageComposer');
var MessageComposer = sdk.getComponent('rooms.MessageComposer');
var CallView = sdk.getComponent("voip.CallView");
var RoomSettings = sdk.getComponent("rooms.RoomSettings");
var SearchBar = sdk.getComponent("molecules.SearchBar");