OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix CSS for import/export buttons

pull/21833/head
Matthew Hodgson 2017-02-09 02:00:58 +00:00
parent ea50acfc87
commit ad2710ec5d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -552,21 +552,20 @@ module.exports = React.createClass({
const deviceId = client.deviceId; const deviceId = client.deviceId;
const identityKey = client.getDeviceEd25519Key() || "<not supported>"; const identityKey = client.getDeviceEd25519Key() || "<not supported>";
let exportButton = null, let importExportButtons = null;
importButton = null;
if (client.isCryptoEnabled) { if (client.isCryptoEnabled) {
exportButton = ( importExportButtons = (
<AccessibleButton className="mx_UserSettings_button" <div className="mx_UserSettings_importExportButtons">
onClick={this._onExportE2eKeysClicked}> <AccessibleButton className="mx_UserSettings_button"
Export E2E room keys onClick={this._onExportE2eKeysClicked}>
</AccessibleButton> Export E2E room keys
); </AccessibleButton>
importButton = ( <AccessibleButton className="mx_UserSettings_button"
<AccessibleButton className="mx_UserSettings_button" onClick={this._onImportE2eKeysClicked}>
onClick={this._onImportE2eKeysClicked}> Import E2E room keys
Import E2E room keys </AccessibleButton>
</AccessibleButton> </div>
); );
} }
return ( return (
@ -577,8 +576,7 @@ module.exports = React.createClass({
<li><label>Device ID:</label> <span><code>{deviceId}</code></span></li> <li><label>Device ID:</label> <span><code>{deviceId}</code></span></li>
<li><label>Device key:</label> <span><code><b>{identityKey}</b></code></span></li> <li><label>Device key:</label> <span><code><b>{identityKey}</b></code></span></li>
</ul> </ul>
{exportButton} { importExportButtons }
{importButton}
</div> </div>
<div className="mx_UserSettings_section"> <div className="mx_UserSettings_section">
{ CRYPTO_SETTINGS_LABELS.map( this._renderLocalSetting ) } { CRYPTO_SETTINGS_LABELS.map( this._renderLocalSetting ) }