imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into travis/permalink-routing

Browse source
This commit is contained in:
Travis Ralston 2018-10-24 09:12:14 -06:00
commit d7367a7cfd
31 changed files with 186 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/MatrixChat.js
View file

@ -1035,6 +1035,7 @@ export default React.createClass({
{ warnings }
</span>
),
button: _t("Leave"),
onFinished: (shouldLeave) => {
if (shouldLeave) {
const d = MatrixClientPeg.get().leave(roomId);
@ -1407,8 +1408,8 @@ export default React.createClass({
// Fire the tinter right on startup to ensure the default theme is applied
// A later sync can/will correct the tint to be the right value for the user
const color_scheme = SettingsStore.getValue("roomColor");
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
const colorScheme = SettingsStore.getValue("roomColor");
Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
},
/**