Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of accidental merge stuff

Browse Source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-11-07 11:05:29 -07:00 committed by GitHub
parent 144cbd144e
commit beddf3a2cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/skins/vector/css/themes/_base.scss
View File

@ -26,10 +26,6 @@ $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
$pinned-unread-color: #ff0064; // $warning-color $pinned-unread-color: #ff0064; // $warning-color
$pinned-color: #888; $pinned-color: #888;
// groups
$group-my-groups-placeholder-bg: #f7f7f7;
$group-my-groups-placeholder-fg: #888;
// informational plinth // informational plinth
$info-plinth-bg-color: #f7f7f7; $info-plinth-bg-color: #f7f7f7;
$info-plinth-fg-color: #888; $info-plinth-fg-color: #888;