matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-30 02:21:17 +03:00
Code Activity

fix context menu bg

Browse Source
This commit is contained in:
Matthew Hodgson
2017-01-20 02:47:47 +00:00
parent 16d8e8e681
commit b76b0f755d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/MatrixChat.js
View File

@ -25,7 +25,6 @@ var SdkConfig = require("../../SdkConfig");
var ContextualMenu = require("./ContextualMenu"); var ContextualMenu = require("./ContextualMenu");
var RoomListSorter = require("../../RoomListSorter"); var RoomListSorter = require("../../RoomListSorter");
var UserActivity = require("../../UserActivity"); var UserActivity = require("../../UserActivity");
var UserSettingsStore = require('../../UserSettingsStore');
var Presence = require("../../Presence"); var Presence = require("../../Presence");
var dis = require("../../dispatcher"); var dis = require("../../dispatcher");

4
src/components/views/rooms/RoomTile.js
View File

@ -26,6 +26,7 @@ var sdk = require('../../../index');
var ContextualMenu = require('../../structures/ContextualMenu'); var ContextualMenu = require('../../structures/ContextualMenu');
var RoomNotifs = require('../../../RoomNotifs'); var RoomNotifs = require('../../../RoomNotifs');
var FormattingUtils = require('../../../utils/FormattingUtils'); var FormattingUtils = require('../../../utils/FormattingUtils');
var UserSettingsStore = require('../../../UserSettingsStore');
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'RoomTile', displayName: 'RoomTile',
@ -176,7 +177,8 @@ module.exports = React.createClass({
var self = this; var self = this;
ContextualMenu.createMenu(RoomTagMenu, { ContextualMenu.createMenu(RoomTagMenu, {
chevronOffset: 10, chevronOffset: 10,
menuColour: "#FFFFFF", // XXX: fix horrid hardcoding
menuColour: UserSettingsStore.getSyncedSettings().theme === 'dark' ? "#2d2d2d" : "#FFFFFF",
left: x, left: x,
top: y, top: y,
room: this.props.room, room: this.props.room,