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

fix up UserSettings a bit and add fading

Browse source
This commit is contained in:
Matthew Hodgson 2016-04-15 18:30:13 +01:00
parent a06b420942
commit f625e2d693
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/components/structures/UserSettings.js
View file

@ -51,7 +51,11 @@ module.exports = React.createClass({
}, },
componentWillMount: function() { componentWillMount: function() {
var self = this; dis.dispatch({
action: 'ui_opacity',
sideOpacity: 0.3,
middleOpacity: 0.3,
});
this._refreshFromServer(); this._refreshFromServer();
}, },
@ -61,6 +65,11 @@ module.exports = React.createClass({
}, },
componentWillUnmount: function() { componentWillUnmount: function() {
dis.dispatch({
action: 'ui_opacity',
sideOpacity: 1.0,
middleOpacity: 1.0,
});
dis.unregister(this.dispatcherRef); dis.unregister(this.dispatcherRef);
}, },
@ -321,7 +330,7 @@ module.exports = React.createClass({
var notification_area; var notification_area;
if (!MatrixClientPeg.get().isGuest()) { if (!MatrixClientPeg.get().isGuest()) {
notification_area = (<div> notification_area = (<div>
<h2>Notifications</h2> <h3>Notifications</h3>
<div className="mx_UserSettings_section"> <div className="mx_UserSettings_section">
<Notifications/> <Notifications/>
@ -335,7 +344,7 @@ module.exports = React.createClass({
<GeminiScrollbar className="mx_UserSettings_body" autoshow={true}> <GeminiScrollbar className="mx_UserSettings_body" autoshow={true}>
<h2>Profile</h2> <h3>Profile</h3>
<div className="mx_UserSettings_section"> <div className="mx_UserSettings_section">
<div className="mx_UserSettings_profileTable"> <div className="mx_UserSettings_profileTable">
@ -366,10 +375,10 @@ module.exports = React.createClass({
</div> </div>
</div> </div>
<h2>Account</h2> <h3>Account</h3>
<div className="mx_UserSettings_section"> <div className="mx_UserSettings_section">
<div className="mx_UserSettings_logout mx_UserSettings_button" onClick={this.onLogoutClicked}> <div className="mx_UserSettings_logout mx_UserSettings_button" onClick={this.onLogoutClicked}>
Log out Log out
</div> </div>
@ -379,7 +388,7 @@ module.exports = React.createClass({
{notification_area} {notification_area}
<h2>Advanced</h2> <h3>Advanced</h3>
<div className="mx_UserSettings_section"> <div className="mx_UserSettings_section">
<div className="mx_UserSettings_advanced"> <div className="mx_UserSettings_advanced">