Unverified Commit 0e1e20dc authored by Thibaut Sardan's avatar Thibaut Sardan Committed by GitHub

Merge pull request #370 from paritytech/luke-misc-thibaut

Change Cancel to Back button. Password field autofocus on Unlock component
parents 32b6f35d e80dc54b
Pipeline #28586 canceled with stages
in 20 minutes and 30 seconds
......@@ -57,7 +57,7 @@ class AccountCopyPhrase extends Component {
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -213,7 +213,7 @@ class AccountImportOptions extends Component {
<p>{error}</p>
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button className='button -cancel' onClick={history.goBack}>
<button className='button -back' onClick={history.goBack}>
Back
</button>
)}
......
......@@ -97,7 +97,7 @@ class AccountName extends Component {
)}
</div>
<div className='account_change_blockies'>
<button className='button -cancel' onClick={generateNewAccount}>
<button className='button -back' onClick={generateNewAccount}>
Generate another icon
</button>
</div>
......@@ -132,7 +132,7 @@ class AccountName extends Component {
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -107,7 +107,7 @@ class AccountPassword extends Component {
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -72,7 +72,7 @@ class AccountRewritePhrase extends Component {
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -94,7 +94,7 @@ class BackupAccount extends Component {
<nav className='form-nav -space-around'>
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -83,7 +83,7 @@ class ScanSignedTx extends Component {
<nav className='form-nav -space-around'>
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -70,7 +70,7 @@ class TxQrCode extends Component {
/>
<nav className='form-nav -space-around'>
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -95,6 +95,7 @@ class Unlock extends Component {
</div>
<Field
autoFocus
label='Password'
name='password'
render={FetherForm.Field}
......@@ -104,11 +105,11 @@ class Unlock extends Component {
<nav className='form-nav -binary'>
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
Cancel
Back
</button>
<button
......
......@@ -101,7 +101,7 @@
}
}
&.-cancel {
&.-back {
font-size: ms(-2);
border-width: 0;
background-color: $faint;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment