diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 09ef20260592..a4a5a35b09b7 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -732,7 +732,7 @@ "message": "We’re happy to see you." }, "hardware": { - "message": "hardware" + "message": "Hardware" }, "hardwareWalletConnected": { "message": "Hardware wallet connected" diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss index 778025243992..41b170e417a2 100644 --- a/ui/app/css/itcss/components/new-account.scss +++ b/ui/app/css/itcss/components/new-account.scss @@ -4,6 +4,12 @@ box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); z-index: 25; height: unset; + overflow: auto; + scrollbar-width: none; + + &::-webkit-scrollbar { + display: none; + } @media screen and (min-width: 576px) { position: absolute; @@ -204,7 +210,7 @@ &__btn { background: #fbfbfb; - border: 1px solid #e5e5e5; + border: 2px solid #e5e5e5; height: 100px; width: 150px; flex: 1; @@ -212,6 +218,7 @@ align-items: center; justify-content: center; border-radius: 5px; + padding: 0; &__img { width: 95px; @@ -458,16 +465,20 @@ } } -.new-account-connect-form { +.new-external-account-form { display: flex; flex-flow: column; align-items: center; padding: 15px 30px 0; - height: 710px; - overflow: auto; &.unsupported-browser { height: 210px; + overflow: auto; + scrollbar-width: none; + + &::-webkit-scrollbar { + display: none; + } } &.account-list { diff --git a/ui/app/pages/create-account/connect-hardware/account-list.js b/ui/app/pages/create-account/connect-hardware/account-list.js index 6dfe322a74df..933a26b5da46 100644 --- a/ui/app/pages/create-account/connect-hardware/account-list.js +++ b/ui/app/pages/create-account/connect-hardware/account-list.js @@ -135,11 +135,11 @@ class AccountList extends Component { } return ( -
+
-
+ ) } renderUnsupportedBrowser () { return ( -
+

{this.context.t('browserNotSupported')}

{this.context.t('chromeRequiredForHardwareWallets')}

@@ -206,7 +206,7 @@ class ConnectScreen extends Component { renderConnectScreen () { return ( -
+
{this.renderHeader()} {this.renderButtons()} {this.renderTrezorAffiliateLink()} @@ -224,6 +224,3 @@ class ConnectScreen extends Component { return this.renderUnsupportedBrowser() } } - -export default ConnectScreen - diff --git a/ui/app/pages/create-account/create-account.component.js b/ui/app/pages/create-account/create-account.component.js index d532a78ebc2d..2389650e7f29 100644 --- a/ui/app/pages/create-account/create-account.component.js +++ b/ui/app/pages/create-account/create-account.component.js @@ -30,7 +30,7 @@ export default class CreateAccountPage extends Component { {this.context.t('import')}
history.push(CONNECT_HARDWARE_ROUTE)}> - {this.context.t('connect')} + {this.context.t('hardware')}
)