finish merging element-hq/element-web#5881 into matrix-react-sdk

matrix-org · Apr 16, 2018 · 46f5c0d · 46f5c0d
1 parent f1f7673
commit 46f5c0d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git 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
@@ -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;