From 3a3dcd53fb5bebe4411331541a45179746f8435e Mon Sep 17 00:00:00 2001 From: Gina Contrino Date: Wed, 14 Mar 2018 10:24:45 +0100 Subject: [PATCH 1/3] Improve account switcher wording --- i18n/locales/en/common.json | 4 ++-- src/components/savedAccounts/savedAccounts.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/locales/en/common.json b/i18n/locales/en/common.json index 00fdf510a1..0b08a9d4dd 100644 --- a/i18n/locales/en/common.json +++ b/i18n/locales/en/common.json @@ -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", @@ -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", diff --git a/src/components/savedAccounts/savedAccounts.js b/src/components/savedAccounts/savedAccounts.js index f670e270c7..621aa12d67 100644 --- a/src/components/savedAccounts/savedAccounts.js +++ b/src/components/savedAccounts/savedAccounts.js @@ -77,7 +77,7 @@ class SavedAccounts extends React.Component {

- {t('Your favorite Lisk IDs')} + {t('Your Lisk IDs')}

  • @@ -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 }
  • From e724ab14134b3960d6e3014346b5043e571e18b4 Mon Sep 17 00:00:00 2001 From: Gina Contrino Date: Wed, 14 Mar 2018 10:43:10 +0100 Subject: [PATCH 2/3] Align close button with header in account switcher --- .../savedAccounts/savedAccounts.css | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/savedAccounts/savedAccounts.css b/src/components/savedAccounts/savedAccounts.css index d36ed8dd86..5615d52b25 100644 --- a/src/components/savedAccounts/savedAccounts.css +++ b/src/components/savedAccounts/savedAccounts.css @@ -217,7 +217,7 @@ .closeButton { box-shadow: var(--close-button-shadow); position: absolute !important; - top: 85px; + top: var(--h1-padding-l); right: 85px; } @@ -259,6 +259,10 @@ padding-top: var(--h1-padding-xl); } } + + .closeButton { + top: var(--h1-padding-xl); + } } @media (--medium-viewport) { @@ -294,7 +298,7 @@ } .closeButton { - top: 35px; + top: var(--h1-padding-m); right: 35px; } @@ -322,6 +326,11 @@ } } + .closeButton { + top: 15px; + right: 15px; + } + .cardsWrapper { padding: 0; } @@ -356,10 +365,3 @@ } } } - -@media (--xSmall-viewport) { - .closeButton { - top: 15px; - right: 15px; - } -} From 62601d04dfdb486aa7acd65806a1997047a7282e Mon Sep 17 00:00:00 2001 From: Gina Contrino Date: Wed, 14 Mar 2018 10:56:58 +0100 Subject: [PATCH 3/3] Remove header width in account switcher --- src/components/savedAccounts/savedAccounts.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/components/savedAccounts/savedAccounts.css b/src/components/savedAccounts/savedAccounts.css index 5615d52b25..57d1dab1e5 100644 --- a/src/components/savedAccounts/savedAccounts.css +++ b/src/components/savedAccounts/savedAccounts.css @@ -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; @@ -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; } } @@ -270,7 +267,6 @@ & > h1 { font-size: var(--font-size-ids-h1-l); padding: var(--h1-padding-m); - width: var(--h1-width-m); } } @@ -322,7 +318,6 @@ .wrapper { & > h1 { font-size: var(--font-size-ids-h1-s); - width: var(--h1-width-s); } }