PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3988 from matrix-org/t3chguy/fix_Field_usage

Browse source 
Pass an ID to the <Field/> as needed and fix div inside p nesting
This commit is contained in:
Michael Telatynski 2020-01-29 22:45:34 +00:00 committed by GitHub
commit 1475f5c73a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
View file

@ -37,6 +37,10 @@ limitations under the License.
flex: 0 0 auto; flex: 0 0 auto;
margin-left: 30px; margin-left: 30px;
} }
details .mx_AccessibleButton {
margin: 1em 0; // emulate paragraph spacing because we can't put this button in a paragraph due to HTML rules
}
} }
.mx_CreateSecretStorageDialog .mx_Dialog_title { .mx_CreateSecretStorageDialog .mx_Dialog_title {

8
src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
View file

@ -480,7 +480,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
)}</p> )}</p>
<div className="mx_CreateSecretStorageDialog_passPhraseContainer"> <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
<Field type="password" <Field
type="password"
id="mx_CreateSecretStorageDialog_passPhraseField"
className="mx_CreateSecretStorageDialog_passPhraseField" className="mx_CreateSecretStorageDialog_passPhraseField"
onChange={this._onPassPhraseChange} onChange={this._onPassPhraseChange}
onKeyPress={this._onPassPhraseKeyPress} onKeyPress={this._onPassPhraseKeyPress}
@ -512,9 +514,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
<details> <details>
<summary>{_t("Advanced")}</summary> <summary>{_t("Advanced")}</summary>
<p><AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} > <AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
{_t("Set up with a recovery key")} {_t("Set up with a recovery key")}
</AccessibleButton></p> </AccessibleButton>
</details> </details>
</div>; </div>;
} }