Skip to content

Commit

Permalink
Merge pull request #1554 from LiskHQ/1553-Initialization-buttons-are-…
Browse files Browse the repository at this point in the history
…not-well-aligned

Initialization buttons are not well aligned - Closes #1553 #1552 #1551 #1550
  • Loading branch information
Osvaldo Vega Agüero authored Dec 10, 2018
2 parents dbce8eb + 3e919ab commit 47260e5
Show file tree
Hide file tree
Showing 33 changed files with 260 additions and 918 deletions.
5 changes: 0 additions & 5 deletions i18n/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@
"Rank": "Rank",
"Rank / Status": "Rank / Status",
"Read More": "Read More",
"Receiver": "Receiver",
"Recent searches": "Recent searches",
"Recipient": "Recipient",
"Redo": "Redo",
Expand All @@ -269,7 +268,6 @@
"Request": "Request",
"Request LSK": "Request LSK",
"Request specific amount": "Request specific amount",
"Request specific amount (LSK)": "Request specific amount (LSK)",
"Required": "Required",
"Reset": "Reset",
"Reset timer & continue": "Reset timer & continue",
Expand Down Expand Up @@ -316,7 +314,6 @@
"Sign back in": "Sign back in",
"Sign in": "Sign in",
"Sorry": "Sorry",
"Specify Amount": "Specify Amount",
"Standby": "Standby",
"Start here": "Start here",
"Start the tour": "Start the tour",
Expand Down Expand Up @@ -355,7 +352,6 @@
"Transaction is being processed and will be confirmed. It may take up to 15 minutes to be secured in the blockchain.": "Transaction is being processed and will be confirmed. It may take up to 15 minutes to be secured in the blockchain.",
"Transaction not found": "Transaction not found",
"Transactions can’t be reversed": "Transactions can’t be reversed",
"Transfer": "Transfer",
"Try Again": "Try Again",
"Try again": "Try again",
"Try using menu for navigation.": "Try using menu for navigation.",
Expand Down Expand Up @@ -422,7 +418,6 @@
"Your passphrase is used to access your Lisk ID.": "Your passphrase is used to access your Lisk ID.",
"Your registration is secured on the blockchain": "Your registration is secured on the blockchain",
"Your registration is secured on the blockchain.": "Your registration is secured on the blockchain.",
"Your request": "Your request",
"Your second passphrase registration is being processed and will be confirmed.": "Your second passphrase registration is being processed and will be confirmed.",
"Your selection": "Your selection",
"Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.": "Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.",
Expand Down
4 changes: 1 addition & 3 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module.exports = {
'src/components/newsFeed/index.test.js', // This component doesn't meet the setted tresholds for mocha but in jest
'src/components/passphraseCreation/index.test.js',
'src/components/register/register.test.js',
'src/components/request/specifyRequest.test.js',
'src/components/transactions/votedDelegates.test.js',
'src/components/voteUrlProcessor/index.test.js',
'src/store/middlewares/login.test.js',
Expand Down Expand Up @@ -60,9 +59,8 @@ module.exports = {
'src/components/passphraseCreation/index.js',
'src/components/passphraseSteps/index.js', // FollowUp #1515
'src/components/passphraseSteps/index.js', // FollowUp #1515
'src/components/receive/index.js',
'src/components/request/index.js',
'src/components/register/register.js',
'src/components/request/specifyRequest.js',
'src/components/resultBox/index.js',
'src/components/resultBox/resultBox.js', // FollowUp #1515
'src/components/resultBox/resultBox.js', // FollowUp #1515
Expand Down
4 changes: 2 additions & 2 deletions src/components/accountInitialization/accountInit.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 15%;

& header {
& h2 {
font-weight: var(--font-weight-semi-bold);
text-align: left;
}
}

Expand All @@ -41,8 +41,8 @@
}

& > footer {
margin-top: 40px;
padding: 0;
margin-bottom: 20px;
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/accountInitialization/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ class AccountInitialization extends React.Component {
</p>
</div>
<footer>
<div className={grid.row} >
<div className={grid['col-xs-4']}>
<div className={` ${grid.row} ${grid['center-xs']} ${grid['center-sm']} ${grid['center-md']} ${grid['center-lg']}`} >
<div className={`${grid['col-xs-4']} ${grid['col-sd-6']} ${grid['col-md-5']} ${grid['col-lg-4']}`}>
<Button
label={t('Discard')}
onClick={this.closeInfo.bind(this)}
className={`account-init-discard-button ${styles.button}`}
/>
</div>
<div className={grid['col-xs-8']}>
<div className={`${grid['col-xs-4']} ${grid['col-sd-6']} ${grid['col-md-5']} ${grid['col-lg-4']}`}>
<Button
label={t('Next')}
onClick={() => nextStep({ account, accountInit: true }, 2)}
Expand Down
16 changes: 0 additions & 16 deletions src/components/receive/index.js

This file was deleted.

116 changes: 0 additions & 116 deletions src/components/receive/receiveConfirmation.js

This file was deleted.

129 changes: 0 additions & 129 deletions src/components/receive/request.css

This file was deleted.

Loading

0 comments on commit 47260e5

Please sign in to comment.