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

2017-10-14 22:41:36 +00:00 · 2017-10-14 22:41:36 +00:00 · 463e17b223
parent 3428c1c3d3 71d25bf787
commit 463e17b223
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@ -34,7 +34,7 @@ const ROOM_COLORS = [
    ["#dad658", "#f5f4ea"],
    ["#80c553", "#eef5ea"],
    ["#bb814e", "#eee8e3"],
-    ["#595959", "#ececec"],
+    //["#595959", "#ececec"], // Grey makes everything appear disabled, so remove it for now
 ];

 module.exports = React.createClass({