From f625e2d69365bd25cee0d050347ff6b99ab38b4c Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Apr 2016 18:30:13 +0100 Subject: [PATCH] fix up UserSettings a bit and add fading --- src/components/structures/UserSettings.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index a5f2a59878..e6895df41d 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -51,7 +51,11 @@ module.exports = React.createClass({ }, componentWillMount: function() { - var self = this; + dis.dispatch({ + action: 'ui_opacity', + sideOpacity: 0.3, + middleOpacity: 0.3, + }); this._refreshFromServer(); }, @@ -61,6 +65,11 @@ module.exports = React.createClass({ }, componentWillUnmount: function() { + dis.dispatch({ + action: 'ui_opacity', + sideOpacity: 1.0, + middleOpacity: 1.0, + }); dis.unregister(this.dispatcherRef); }, @@ -321,7 +330,7 @@ module.exports = React.createClass({ var notification_area; if (!MatrixClientPeg.get().isGuest()) { notification_area = (
-

Notifications

+

Notifications

@@ -335,7 +344,7 @@ module.exports = React.createClass({ -

Profile

+

Profile

@@ -366,10 +375,10 @@ module.exports = React.createClass({
-

Account

+

Account

- +
Log out
@@ -379,7 +388,7 @@ module.exports = React.createClass({ {notification_area} -

Advanced

+

Advanced