mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-16 05:04:57 +08:00
Get rid of accidental merge stuff
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
parent
144cbd144e
commit
beddf3a2cb
@ -26,10 +26,6 @@ $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
|
||||
$pinned-unread-color: #ff0064; // $warning-color
|
||||
$pinned-color: #888;
|
||||
|
||||
// groups
|
||||
$group-my-groups-placeholder-bg: #f7f7f7;
|
||||
$group-my-groups-placeholder-fg: #888;
|
||||
|
||||
// informational plinth
|
||||
$info-plinth-bg-color: #f7f7f7;
|
||||
$info-plinth-fg-color: #888;
|
||||
|
Loading…
Reference in New Issue
Block a user