diff --git a/packages/app-accounts/src/Account.tsx b/packages/app-accounts/src/Account.tsx index a5714c3fde..18a4c96bdf 100644 --- a/packages/app-accounts/src/Account.tsx +++ b/packages/app-accounts/src/Account.tsx @@ -6,8 +6,7 @@ import { ActionStatus } from '@polkadot/ui-app/Status/types'; import { I18nProps } from '@polkadot/ui-app/types'; import React from 'react'; -import styled from 'styled-components'; -import { AddressInfo, AddressRow, Button, Icon } from '@polkadot/ui-app'; +import { AddressInfo, AddressRow, Button, Card, Icon } from '@polkadot/ui-app'; import keyring from '@polkadot/ui-keyring'; import Backup from './modals/Backup'; @@ -29,44 +28,6 @@ type State = { isTransferOpen: boolean }; -// FIXME This is duplicated in app-ddresses -const Wrapper = styled.article` - position: relative; - flex: 1 1; - min-width: 24%; - max-width: 24%; - justify-content: space-around; - - .accounts--Account-buttons { - text-align: right; - margin-bottom: 2em; - } - - .ui--AddressSummary-base { - flex: 1; - padding: 0; - } - - .accounts--Account-buttons > button { - margin: .2em; - } - - @media (max-width: 2060px) { - min-width: 32%; - max-width: 32%; - } - - @media (max-width: 1580px) { - min-width: 49%; - max-width: 49%; - } - - @media (max-width: 1100px) { - min-width: 100%; - max-width: 100%; - } -`; - class Account extends React.PureComponent { state: State; @@ -89,7 +50,7 @@ class Account extends React.PureComponent { // FIXME It is a bit heavy-handled switching of being editable here completely // (and removing the tags, however the keyring cannot save these) return ( - + {this.renderModals()} { value={address} /> - + ); } diff --git a/packages/app-accounts/src/Overview.tsx b/packages/app-accounts/src/Overview.tsx index 4835290edd..ae074b622f 100644 --- a/packages/app-accounts/src/Overview.tsx +++ b/packages/app-accounts/src/Overview.tsx @@ -7,10 +7,9 @@ import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { ComponentProps } from './types'; import React from 'react'; -import styled from 'styled-components'; import accountObservable from '@polkadot/ui-keyring/observable/accounts'; import { withMulti, withObservable } from '@polkadot/ui-api'; -import { Button } from '@polkadot/ui-app'; +import { Button, CardGrid } from '@polkadot/ui-app'; import CreateModal from './modals/Create'; import ImportModal from './modals/Import'; @@ -26,19 +25,6 @@ type State = { isImportOpen: boolean }; -const Wrapper = styled.div` - .accounts { - display: flex; - flex-wrap: wrap; - - .spacer { - flex: 1 1; - margin: .25rem; - padding: 1rem 1.5rem; - } - } -`; - class Overview extends React.PureComponent { state: State = { isCreateOpen: false, @@ -50,20 +36,23 @@ class Overview extends React.PureComponent { const { isCreateOpen, isImportOpen } = this.state; return ( - - -