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

PR feedback: re-order CSS & add underscore

pull/21833/head
David Baker 2020-06-26 11:24:07 +01:00
parent 78f750265c
commit bf45cb0588
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/css/views/elements/_StyledRadioButton.scss
View File

@ -35,11 +35,10 @@ limitations under the License.
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
flex-direction: column;
margin-left: 8px; margin-left: 8px;
margin-right: 8px; margin-right: 8px;
flex-direction: column;
} }
.mx_RadioButton_spacer { .mx_RadioButton_spacer {

20
src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
View File

@ -44,8 +44,8 @@ const PHASE_CONFIRM_SKIP = 10;
const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc. const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
// these end up as strings from being values in the radio buttons, so just use strings // these end up as strings from being values in the radio buttons, so just use strings
const CREATESTORAGE_OPTION_KEY = 'key'; const CREATE_STORAGE_OPTION_KEY = 'key';
const CREATESTORAGE_OPTION_PASSPHRASE = 'passphrase'; const CREATE_STORAGE_OPTION_PASSPHRASE = 'passphrase';
/* /*
* Walks the user through the process of creating a passphrase to guard Secure * Walks the user through the process of creating a passphrase to guard Secure
@ -86,7 +86,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
accountPassword: props.accountPassword || "", accountPassword: props.accountPassword || "",
accountPasswordCorrect: null, accountPasswordCorrect: null,
passPhraseKeySelected: CREATESTORAGE_OPTION_KEY, passPhraseKeySelected: CREATE_STORAGE_OPTION_KEY,
}; };
this._passphraseField = createRef(); this._passphraseField = createRef();
@ -171,7 +171,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
} }
_onChooseKeyPassphraseFormSubmit = async () => { _onChooseKeyPassphraseFormSubmit = async () => {
if (this.state.passPhraseKeySelected === CREATESTORAGE_OPTION_KEY) { if (this.state.passPhraseKeySelected === CREATE_STORAGE_OPTION_KEY) {
this._recoveryKey = this._recoveryKey =
await MatrixClientPeg.get().createRecoveryKeyFromPassphrase(); await MatrixClientPeg.get().createRecoveryKeyFromPassphrase();
this.setState({ this.setState({
@ -440,10 +440,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
)}</p> )}</p>
<div className="mx_CreateSecretStorageDialog_primaryContainer" role="radiogroup" onChange={this._onKeyPassphraseChange}> <div className="mx_CreateSecretStorageDialog_primaryContainer" role="radiogroup" onChange={this._onKeyPassphraseChange}>
<StyledRadioButton <StyledRadioButton
key={CREATESTORAGE_OPTION_KEY} key={CREATE_STORAGE_OPTION_KEY}
value={CREATESTORAGE_OPTION_KEY} value={CREATE_STORAGE_OPTION_KEY}
name="keyPassphrase" name="keyPassphrase"
checked={this.state.passPhraseKeySelected === CREATESTORAGE_OPTION_KEY} checked={this.state.passPhraseKeySelected === CREATE_STORAGE_OPTION_KEY}
> >
<div className="mx_CreateSecretStorageDialog_optionTitle"> <div className="mx_CreateSecretStorageDialog_optionTitle">
<img className="mx_CreateSecretStorageDialog_optionIcon" <img className="mx_CreateSecretStorageDialog_optionIcon"
@ -454,10 +454,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
<div>{_t("We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.")}</div> <div>{_t("We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.")}</div>
</StyledRadioButton> </StyledRadioButton>
<StyledRadioButton <StyledRadioButton
key={CREATESTORAGE_OPTION_PASSPHRASE} key={CREATE_STORAGE_OPTION_PASSPHRASE}
value={CREATESTORAGE_OPTION_PASSPHRASE} value={CREATE_STORAGE_OPTION_PASSPHRASE}
name="keyPassphrase" name="keyPassphrase"
checked={this.state.passPhraseKeySelected === CREATESTORAGE_OPTION_PASSPHRASE} checked={this.state.passPhraseKeySelected === CREATE_STORAGE_OPTION_PASSPHRASE}
> >
<div className="mx_CreateSecretStorageDialog_optionTitle"> <div className="mx_CreateSecretStorageDialog_optionTitle">
<img className="mx_CreateSecretStorageDialog_optionIcon" <img className="mx_CreateSecretStorageDialog_optionIcon"