aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Goncharov <kdgoncharov@gmail.com>2019-06-17 19:07:34 +0800
committerDan J Miller <danjm.com@gmail.com>2019-06-17 19:07:34 +0800
commita47370057e9453e49c1d83a17fcdda275affb940 (patch)
tree19d2777bcfcd88d2364366e58902db37359a99f1
parent6fb0d4af276316c5170a03f31695f72a88cbe278 (diff)
downloadtangerine-wallet-browser-a47370057e9453e49c1d83a17fcdda275affb940.tar.gz
tangerine-wallet-browser-a47370057e9453e49c1d83a17fcdda275affb940.tar.zst
tangerine-wallet-browser-a47370057e9453e49c1d83a17fcdda275affb940.zip
Fix styles on 'import account' page, update help link (#6700)
* Fix styles on 'import account' page, update help link * Update changelog
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/css/itcss/components/new-account.scss1
-rw-r--r--ui/app/pages/create-account/import-account/json.js6
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7f7baddf..cc9f67991 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Develop Branch
+- [#6700](https://github.com/MetaMask/metamask-extension/pull/6700): Fix styles on 'import account' page, update help link
+
## 6.6.1 Thu Jun 06 2019
- [#6691](https://github.com/MetaMask/metamask-extension/pull/6691): Revert "Improve ENS Address Input" to fix bugs on input field on non-main networks.
diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss
index 7bfa2d443..b3aae8eec 100644
--- a/ui/app/css/itcss/components/new-account.scss
+++ b/ui/app/css/itcss/components/new-account.scss
@@ -143,6 +143,7 @@
flex-flow: column;
align-items: center;
margin-top: 29px;
+ width: 100%;
}
&__buttons {
diff --git a/ui/app/pages/create-account/import-account/json.js b/ui/app/pages/create-account/import-account/json.js
index ad430ba58..2482e49d1 100644
--- a/ui/app/pages/create-account/import-account/json.js
+++ b/ui/app/pages/create-account/import-account/json.js
@@ -8,9 +8,10 @@ const actions = require('../../../store/actions')
const FileInput = require('react-simple-file-input').default
const { DEFAULT_ROUTE } = require('../../../helpers/constants/routes')
const { getMetaMaskAccounts } = require('../../../selectors/selectors')
-const HELP_LINK = 'https://support.metamask.io/kb/article/7-importing-accounts'
import Button from '../../../components/ui/button'
+const HELP_LINK = 'https://metamask.zendesk.com/hc/en-us/articles/360015489351-Importing-Accounts'
+
class JsonImportSubview extends Component {
constructor (props) {
super(props)
@@ -37,10 +38,11 @@ class JsonImportSubview extends Component {
readAs: 'text',
onLoad: this.onLoad.bind(this),
style: {
- margin: '20px 0px 12px 34%',
+ padding: '20px 0px 12px 15%',
fontSize: '15px',
display: 'flex',
justifyContent: 'center',
+ width: '100%',
},
}),