Browse Source
Fix font sizes and padding on various places
master
meriadec
7 years ago
No known key found for this signature in database
GPG Key ID: 1D2FC2305E2CB399
10 changed files with
37 additions and
41 deletions
-
src/components/AccountPage.js
-
src/components/Breadcrumb/index.js
-
src/components/SettingsPage/Profile.js
-
src/components/SettingsPage/index.js
-
src/components/base/Button/index.js
-
src/components/base/Label.js
-
src/components/base/Modal/index.js
-
src/components/base/Tabs/index.js
-
src/components/modals/AddAccount/index.js
-
src/components/modals/Send.js
|
|
@ -52,36 +52,31 @@ class AccountPage extends PureComponent<Props> { |
|
|
|
<Box flow={3}> |
|
|
|
<Box horizontal> |
|
|
|
<Box> |
|
|
|
<Text fontSize={4}>{account.name}</Text> |
|
|
|
<Text fontSize={8}>{account.name}</Text> |
|
|
|
</Box> |
|
|
|
<Box horizontal align="center" justify="flex-end" grow flow={20}> |
|
|
|
<Box> |
|
|
|
<Button primary onClick={() => openModal(MODAL_SEND, { account })}> |
|
|
|
<Box horizontal flow={2} align="center"> |
|
|
|
<Box> |
|
|
|
<Icon name="upload" /> |
|
|
|
</Box> |
|
|
|
<Box>{t('send.title')}</Box> |
|
|
|
<Box horizontal align="center" justify="flex-end" grow flow={2}> |
|
|
|
<Button primary onClick={() => openModal(MODAL_SEND, { account })}> |
|
|
|
<Box horizontal flow={2} align="center"> |
|
|
|
<Box> |
|
|
|
<Icon name="upload" /> |
|
|
|
</Box> |
|
|
|
</Button> |
|
|
|
</Box> |
|
|
|
<Box> |
|
|
|
<Button primary onClick={() => openModal(MODAL_RECEIVE, { account })}> |
|
|
|
<Box horizontal flow={2} align="center"> |
|
|
|
<Box> |
|
|
|
<Icon name="download" /> |
|
|
|
</Box> |
|
|
|
<Box>{t('receive.title')}</Box> |
|
|
|
<Box>{t('send.title')}</Box> |
|
|
|
</Box> |
|
|
|
</Button> |
|
|
|
<Button primary onClick={() => openModal(MODAL_RECEIVE, { account })}> |
|
|
|
<Box horizontal flow={2} align="center"> |
|
|
|
<Box> |
|
|
|
<Icon name="download" /> |
|
|
|
</Box> |
|
|
|
</Button> |
|
|
|
</Box> |
|
|
|
<Box> |
|
|
|
<Button |
|
|
|
icon="sliders-h" |
|
|
|
color="mouse" |
|
|
|
onClick={() => openModal(MODAL_SETTINGS_ACCOUNT, { account })} |
|
|
|
/> |
|
|
|
</Box> |
|
|
|
<Box>{t('receive.title')}</Box> |
|
|
|
</Box> |
|
|
|
</Button> |
|
|
|
<Button |
|
|
|
style={{ width: 50 }} |
|
|
|
icon="sliders-h" |
|
|
|
color="mouse" |
|
|
|
onClick={() => openModal(MODAL_SETTINGS_ACCOUNT, { account })} |
|
|
|
/> |
|
|
|
</Box> |
|
|
|
</Box> |
|
|
|
{accountData && ( |
|
|
|
|
|
@ -10,6 +10,7 @@ const BreadcrumbWrapper = styled(Box).attrs({ |
|
|
|
align: 'center', |
|
|
|
relative: true, |
|
|
|
})`` |
|
|
|
|
|
|
|
const BreadcrumbStep = styled(({ start, active, end, ...props }) => ( |
|
|
|
<Box start={start} end={end} active={active} {...props} /> |
|
|
|
)).attrs({ |
|
|
@ -84,7 +85,7 @@ const Breadcrumb = ({ items, currentStep }: Props) => ( |
|
|
|
<BreadcrumbNumberWrapper> |
|
|
|
<BreadcrumbNumber active={active}>{i + 1}</BreadcrumbNumber> |
|
|
|
</BreadcrumbNumberWrapper> |
|
|
|
<Box fontSize={0}>{item.label}</Box> |
|
|
|
<Box fontSize={3}>{item.label}</Box> |
|
|
|
</BreadcrumbStep> |
|
|
|
</Fragment> |
|
|
|
) |
|
|
|
|
|
@ -90,7 +90,7 @@ class TabProfile extends PureComponent<Props, State> { |
|
|
|
<Box |
|
|
|
horizontal |
|
|
|
align="center" |
|
|
|
flow={1} |
|
|
|
flow={2} |
|
|
|
style={{ cursor: 'pointer' }} |
|
|
|
onClick={() => this.handleChangeInput('password.state')(!isPasswordChecked)} |
|
|
|
> |
|
|
|
|
|
@ -64,8 +64,8 @@ class SettingsPage extends PureComponent<Props, State> { |
|
|
|
} |
|
|
|
|
|
|
|
return ( |
|
|
|
<Box flow={4}> |
|
|
|
<Text fontSize={5}>{t('settings.title')}</Text> |
|
|
|
<Box flow={6}> |
|
|
|
<Text fontSize={7}>{t('settings.title')}</Text> |
|
|
|
<Tabs |
|
|
|
index={tab} |
|
|
|
onTabClick={this.handleChangeTab} |
|
|
|
|
|
@ -41,7 +41,7 @@ function getProps({ disabled, icon, primary }: Object) { |
|
|
|
px: 1, |
|
|
|
}, |
|
|
|
{ |
|
|
|
fontSize: 1, |
|
|
|
fontSize: 4, |
|
|
|
px: 3, |
|
|
|
}, |
|
|
|
), |
|
|
|
|
|
@ -2,7 +2,7 @@ import styled from 'styled-components' |
|
|
|
import { fontSize } from 'styled-system' |
|
|
|
|
|
|
|
export default styled.label.attrs({ |
|
|
|
fontSize: 0, |
|
|
|
fontSize: 3, |
|
|
|
})` |
|
|
|
${fontSize}; |
|
|
|
display: block; |
|
|
|
|
|
@ -72,7 +72,7 @@ const Backdrop = styled(Box).attrs({ |
|
|
|
|
|
|
|
const Wrapper = styled(Tabbable).attrs({ |
|
|
|
bg: 'transparent', |
|
|
|
flow: 20, |
|
|
|
flow: 4, |
|
|
|
mt: 100, |
|
|
|
mb: 100, |
|
|
|
style: p => ({ |
|
|
@ -93,7 +93,7 @@ const Body = styled(Box).attrs({ |
|
|
|
` |
|
|
|
|
|
|
|
const CloseContainer = styled(Box).attrs({ |
|
|
|
p: 2, |
|
|
|
p: 4, |
|
|
|
color: 'mouse', |
|
|
|
})` |
|
|
|
cursor: pointer; |
|
|
@ -214,10 +214,10 @@ export const ModalBody = ({ |
|
|
|
<Body> |
|
|
|
{onClose && ( |
|
|
|
<CloseContainer onClick={onClose}> |
|
|
|
<Icon fontSize={3} name="times" /> |
|
|
|
<Icon fontSize={6} name="times" /> |
|
|
|
</CloseContainer> |
|
|
|
)} |
|
|
|
<Box p={3} {...props}> |
|
|
|
<Box p={5} {...props}> |
|
|
|
{children} |
|
|
|
</Box> |
|
|
|
</Body> |
|
|
|
|
|
@ -12,7 +12,7 @@ const Tab = styled(Tabbable).attrs({ |
|
|
|
pb: 2, |
|
|
|
align: 'center', |
|
|
|
justify: 'center', |
|
|
|
fontSize: 1, |
|
|
|
fontSize: 3, |
|
|
|
})` |
|
|
|
border-bottom: 2px solid transparent; |
|
|
|
border-bottom-color: ${p => (p.isActive ? p.theme.colors.blue : '')}; |
|
|
|
|
|
@ -304,7 +304,7 @@ class AddAccountModal extends PureComponent<Props, State> { |
|
|
|
|
|
|
|
return ( |
|
|
|
<ModalBody onClose={onClose} flow={3}> |
|
|
|
<Text fontSize={4} color="steel"> |
|
|
|
<Text fontSize={6} color="steel"> |
|
|
|
{t('addAccount.title')} |
|
|
|
</Text> |
|
|
|
<Step {...this.getStepProps()} /> |
|
|
|
|
|
@ -30,7 +30,7 @@ const Steps = { |
|
|
|
}} |
|
|
|
> |
|
|
|
<Box flow={3}> |
|
|
|
<Text fontSize={4} color="steel"> |
|
|
|
<Text fontSize={6} color="steel"> |
|
|
|
{t('send.title')} |
|
|
|
</Text> |
|
|
|
<Box flow={1}> |
|
|
@ -157,7 +157,7 @@ class Send extends PureComponent<Props, State> { |
|
|
|
|
|
|
|
return ( |
|
|
|
<Fragment> |
|
|
|
<ModalBody p={2}> |
|
|
|
<ModalBody p={3}> |
|
|
|
<Breadcrumb |
|
|
|
currentStep={step} |
|
|
|
items={[ |
|
|
|