Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve account switcher wording - Closes #488 #557

Merged
merged 3 commits into from
Mar 14, 2018
Merged

Improve account switcher wording - Closes #488 #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a3dcd5
Improve account switcher wording
Mar 14, 2018
e724ab1
Align close button with header in account switcher
Mar 14, 2018
62601d0
Remove header width in account switcher
Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions i18n/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"Register Second Passphrase": "Register Second Passphrase",
"Register as delegate": "Register as delegate",
"Reload": "Reload",
"Remove from Favorites": "Remove from Favorites",
"Remove": "Remove",
"Remove vote from": "Remove vote from",
"Report Issue...": "Report Issue...",
"Required": "Required",
Expand Down Expand Up @@ -222,7 +222,7 @@
"You can vote for up to {{count}} delegates in total._plural": "You can vote for up to {{count}} delegates in total.",
"You have already registered as a delegate.": "You have already registered as a delegate.",
"You've received {{value}} LSK.": "You've received {{value}} LSK.",
"Your favorite Lisk IDs": "Your favorite Lisk IDs",
"Your Lisk IDs": "Your Lisk IDs",
"You’re votes are being processed and will be confirmed. It may take up to 10 minutes to be secured in the blockchain.": "You’re votes are being processed and will be confirmed. It may take up to 10 minutes to be secured in the blockchain.",
"Zero not allowed": "Zero not allowed",
"more": "more",
Expand Down
27 changes: 12 additions & 15 deletions src/components/savedAccounts/savedAccounts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
--h1-padding-xl: 85px;
--h1-padding-l: 40px;
--h1-padding-m: 25px;
--h1-width: 300px;
--h1-width-m: 400px;
--h1-width-s: 260px;
--add-button-margin: 200px;
--card-width: 347px;
--card-height: 436px;
Expand All @@ -36,9 +33,9 @@
text-align: center;
padding-top: var(--h1-padding-l);
margin: 0;
width: var(--h1-width);
left: 50%;
transform: translateX(-50%);
white-space: nowrap;
}
}

Expand Down Expand Up @@ -217,7 +214,7 @@
.closeButton {
box-shadow: var(--close-button-shadow);
position: absolute !important;
top: 85px;
top: var(--h1-padding-l);
right: 85px;
}

Expand Down Expand Up @@ -259,14 +256,17 @@
padding-top: var(--h1-padding-xl);
}
}

.closeButton {
top: var(--h1-padding-xl);
}
}

@media (--medium-viewport) {
.wrapper {
& > h1 {
font-size: var(--font-size-ids-h1-l);
padding: var(--h1-padding-m);
width: var(--h1-width-m);
}
}

Expand Down Expand Up @@ -294,7 +294,7 @@
}

.closeButton {
top: 35px;
top: var(--h1-padding-m);
right: 35px;
}

Expand All @@ -318,10 +318,14 @@
.wrapper {
& > h1 {
font-size: var(--font-size-ids-h1-s);
width: var(--h1-width-s);
}
}

.closeButton {
top: 15px;
right: 15px;
}

.cardsWrapper {
padding: 0;
}
Expand Down Expand Up @@ -356,10 +360,3 @@
}
}
}

@media (--xSmall-viewport) {
.closeButton {
top: 15px;
right: 15px;
}
}
4 changes: 2 additions & 2 deletions src/components/savedAccounts/savedAccounts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class SavedAccounts extends React.Component {
<div className={`${styles.wrapper} save-account`}>
<BackgroundMaker className={styles.background} />
<h1>
{t('Your favorite Lisk IDs')}
{t('Your Lisk IDs')}
</h1>
<ul className={styles.cardsWrapper} >
<li>
Expand Down Expand Up @@ -134,7 +134,7 @@ class SavedAccounts extends React.Component {
{ button: styles.removeButton }
}
onClick={this.handleRemove.bind(this, account)}
label={this.isSelectedForRemove(account) ? t('Confirm') : t('Remove from Favorites')}/> :
label={this.isSelectedForRemove(account) ? t('Confirm') : t('Remove')}/> :
null
}
</li>
Expand Down