matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge branch 'develop' into travis/granular-settings

Browse Source
This commit is contained in:
Travis Ralston
2017-11-13 12:29:36 -07:00
parent c5c346f0b7 ddd230d798
commit 0648b3eae7
14 changed files with 481 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/UserSettings.js
View File

@@ -114,6 +114,7 @@ const CRYPTO_SETTINGS = [
const THEMES = [
{ label: _td('Light theme'), value: 'light' },
{ label: _td('Dark theme'), value: 'dark' },
{ label: _td('Status.im theme'), value: 'status' },
];
const IgnoredUser = React.createClass({
@@ -135,7 +136,7 @@ const IgnoredUser = React.createClass({
render: function() {
return (
<li>
<AccessibleButton onClick={this._onUnignoreClick} className="mx_UserSettings_button mx_UserSettings_buttonSmall">
<AccessibleButton onClick={this._onUnignoreClick} className="mx_textButton">
{ _t("Unignore") }
</AccessibleButton>
{ this.props.userId }