From 46f5c0d2054a02e76ffea41793002e84f88e955a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Mon, 16 Apr 2018 01:13:03 +0100 Subject: [PATCH] finish merging vector-im/riot-web#5881 into matrix-react-sdk --- res/css/_components.scss | 2 -- res/themes/light/css/_base.scss | 5 ----- 2 files changed, 7 deletions(-) diff --git a/res/css/_components.scss b/res/css/_components.scss index b62c08f763..9770010324 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -24,9 +24,7 @@ @import "./structures/_ViewSource.scss"; @import "./structures/login/_Login.scss"; @import "./views/avatars/_BaseAvatar.scss"; -@import "./views/avatars/_MemberPresenceAvatar.scss"; @import "./views/context_menus/_MessageContextMenu.scss"; -@import "./views/context_menus/_PresenceContextMenuOption.scss"; @import "./views/context_menus/_RoomTileContextMenu.scss"; @import "./views/context_menus/_TagTileContextMenu.scss"; @import "./views/dialogs/_BugReportDialog.scss"; diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss index 51d2f70f78..5d5f5d7c90 100644 --- a/res/themes/light/css/_base.scss +++ b/res/themes/light/css/_base.scss @@ -139,11 +139,6 @@ $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color $e2e-unverified-color: #e8bf37; $e2e-warning-color: #ba6363; -// presence -$presence-online: #60de00; -$presence-unavailable: #deb800; -$presence-offline: #b7b7b7; - /*** ImageView ***/ $lightbox-bg-color: #454545; $lightbox-fg-color: #ffffff;