Merge branch 'develop' into travis/granular-settings

2017-11-13 12:29:36 -07:00 · 2017-11-13 12:29:36 -07:00 · 0648b3eae7
commit 0648b3eae7
parent c5c346f0b7 ddd230d798
14 changed files with 481 additions and 248 deletions
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@ -26,7 +26,7 @@ import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";

 const ROOM_COLORS = [
    // magic room default values courtesy of Ribot
-    ["#76cfa6", "#eaf5f0"],
+    [Tinter.getKeyRgb()[0], Tinter.getKeyRgb()[1]],
    ["#81bddb", "#eaf1f4"],
    ["#bd79cb", "#f3eaf5"],
    ["#c65d94", "#f5eaef"],