imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'vector-im/develop' into travis/presence

Browse source
This commit is contained in:
Travis Ralston 2017-10-25 11:27:22 -06:00
commit 45ca890f68
57 changed files with 10231 additions and 841 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/skins/vector/css/themes/_base.scss
View file

@ -22,7 +22,10 @@ $warning-color: #ff0064;
$mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
// groups
$group-alert-color: #774f7e;
$group-my-groups-placeholder-bg: #f7f7f7;
$group-my-groups-placeholder-fg: #888;
$preview-bar-bg-color: #f7f7f7;