Merge branch 'develop' into travis/remove-presence

This commit is contained in:
Travis Ralston 2018-04-11 15:18:30 -06:00
commit 5845a1ec7a
117 changed files with 4096 additions and 1533 deletions

View file

@ -104,6 +104,9 @@ $roomtile-name-color: rgba(69, 69, 69, 0.8);
$roomtile-selected-bg-color: rgba(255, 255, 255, 0.8);
$roomtile-focused-bg-color: rgba(255, 255, 255, 0.9);
$roomtile-transparent-focused-color: rgba(0, 0, 0, 0.1);
$roomsublist-background: rgba(0, 0, 0, 0.05);
$roomsublist-label-fg-color: $h3-color;
$roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color;