Skip to content

Commit

Permalink
Revert "Merge pull request #5286 from turt2live/travis/presence"
Browse files Browse the repository at this point in the history
This reverts commit 3e72d8d.
  • Loading branch information
turt2live authored and dbkr committed Apr 12, 2018
1 parent eaeb495 commit 8dd6164
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 247 deletions.
101 changes: 0 additions & 101 deletions src/components/views/context_menus/PresenceContextMenu.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/skins/vector/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@import "./matrix-react-sdk/structures/_UserSettings.scss";
@import "./matrix-react-sdk/structures/login/_Login.scss";
@import "./matrix-react-sdk/views/avatars/_BaseAvatar.scss";
@import "./matrix-react-sdk/views/avatars/_MemberPresenceAvatar.scss";
@import "./matrix-react-sdk/views/dialogs/_BugReportDialog.scss";
@import "./matrix-react-sdk/views/dialogs/_ChatCreateOrReuseChatDialog.scss";
@import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss";
Expand Down Expand Up @@ -87,7 +86,6 @@
@import "./vector-web/structures/_RoomSubList.scss";
@import "./vector-web/structures/_ViewSource.scss";
@import "./vector-web/views/context_menus/_MessageContextMenu.scss";
@import "./vector-web/views/context_menus/_PresenceContextMenuOption.scss";
@import "./vector-web/views/context_menus/_RoomTileContextMenu.scss";
@import "./vector-web/views/context_menus/_TagTileContextMenu.scss";
@import "./vector-web/views/dialogs/_ChangelogDialog.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,60 +94,6 @@ limitations under the License.
left: 1px;
}

.mx_ContextualMenu.mx_ContextualMenu_top {
top: 8px;
}

.mx_ContextualMenu_chevron_top {
position: absolute;
left: 0px;
top: -8px;
width: 0;
height: 0;
border-left: 8px solid transparent;
border-bottom: 8px solid $menu-border-color;
border-right: 8px solid transparent;
}

.mx_ContextualMenu_chevron_top:after{
content:'';
width: 0;
height: 0;
border-left: 7px solid transparent;
border-bottom: 7px solid $menu-bg-color;
border-right: 7px solid transparent;
position:absolute;
left: -7px;
top: 1px;
}

.mx_ContextualMenu.mx_ContextualMenu_bottom {
bottom: 8px;
}

.mx_ContextualMenu_chevron_bottom {
position: absolute;
left: 0px;
bottom: -8px;
width: 0;
height: 0;
border-left: 8px solid transparent;
border-top: 8px solid $menu-border-color;
border-right: 8px solid transparent;
}

.mx_ContextualMenu_chevron_bottom:after{
content:'';
width: 0;
height: 0;
border-left: 7px solid transparent;
border-top: 7px solid $menu-bg-color;
border-right: 7px solid transparent;
position:absolute;
left: -7px;
bottom: 1px;
}

.mx_ContextualMenu_field {
padding: 3px 6px 3px 6px;
cursor: pointer;
Expand Down

This file was deleted.

5 changes: 0 additions & 5 deletions src/skins/vector/css/themes/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

This file was deleted.

0 comments on commit 8dd6164

Please sign in to comment.