mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-29 04:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-10-14 22:41:36 +00:00
commit 463e17b223
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/room_settings/ColorSettings.js
View file

@ -34,7 +34,7 @@ const ROOM_COLORS = [
["#dad658", "#f5f4ea"], ["#dad658", "#f5f4ea"],
["#80c553", "#eef5ea"], ["#80c553", "#eef5ea"],
["#bb814e", "#eee8e3"], ["#bb814e", "#eee8e3"],
["#595959", "#ececec"], //["#595959", "#ececec"], // Grey makes everything appear disabled, so remove it for now
]; ];
module.exports = React.createClass({ module.exports = React.createClass({