nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'develop' into travis/presence

Browse Source
This commit is contained in:
Travis Ralston
2017-10-14 21:45:59 -06:00
parent 1ca041c59c f143315618
commit e2b02ad60d
7 changed files with 174 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/skins/vector/css/_components.scss
View File

@@ -69,6 +69,8 @@
@import "./matrix-react-sdk/views/voip/_CallView.scss";
@import "./matrix-react-sdk/views/voip/_IncomingCallbox.scss";
@import "./matrix-react-sdk/views/voip/_VideoView.scss";
@import "./matrix-react-sdk/views/rooms/_PinnedEventsPanel.scss";
@import "./matrix-react-sdk/views/rooms/_PinnedEventTile.scss";
@import "./vector-web/_fonts.scss";
@import "./vector-web/structures/_CompatibilityPage.scss";
@import "./vector-web/structures/_HomePage.scss";