Remove container prop from OpenPaper because after rebranding the designs are full-width, reduce stepper content maxWidth, reduce font-size in load owners owners step annotation

This commit is contained in:
Mikhail Mikheev 2019-09-12 18:15:09 +04:00
parent 3c1d2f07c7
commit b457ed78ef
4 changed files with 12 additions and 23 deletions

View File

@ -8,7 +8,7 @@ import { lg } from '~/theme/variables'
const styles = () => ({
root: {
margin: '10px',
maxWidth: '870px',
maxWidth: '770px',
boxShadow: '0 0 10px 0 rgba(33,48,77,0.10)',
},
padding: {
@ -20,27 +20,16 @@ type Props = {
classes: Object,
children: React.Node,
controls: React.Node,
container?: number,
padding?: boolean,
}
const generateContainerStyleFrom = (container?: number) => ({
maxWidth: container ? `${container}px` : undefined,
})
const OpenPaper = ({
classes, children, controls, container, padding = true,
}: Props) => {
const containerStyle = generateContainerStyleFrom(container)
return (
<Paper className={classes.root} elevation={1}>
<Block style={containerStyle} className={padding ? classes.padding : ''}>
{children}
</Block>
{controls}
</Paper>
)
}
classes, children, controls, padding = true,
}: Props) => (
<Paper className={classes.root} elevation={1}>
<Block className={padding ? classes.padding : ''}>{children}</Block>
{controls}
</Paper>
)
export default withStyles(styles)(OpenPaper)

View File

@ -162,7 +162,7 @@ const DetailsForm = withStyles(styles)(Details)
const DetailsPage = () => (controls: React.Node, { errors, form }: Object) => (
<>
<OpenPaper controls={controls} container={605}>
<OpenPaper controls={controls}>
<DetailsForm errors={errors} form={form} />
</OpenPaper>
</>

View File

@ -113,7 +113,7 @@ const OwnerListComponent = (props: Props) => {
return (
<>
<Block className={classes.title}>
<Paragraph noMargin size="lg" color="primary">
<Paragraph noMargin size="md" color="primary">
{`This Safe has ${owners.length} owners. Optional: Provide a name for each owner.`}
</Paragraph>
</Block>
@ -138,7 +138,7 @@ const OwnerListComponent = (props: Props) => {
text="Owner Name"
/>
</Col>
<Col xs={7}>
<Col xs={8}>
<Row className={classes.ownerAddresses}>
<Identicon address={address} diameter={32} />
<Paragraph size="md" color="disabled" noMargin className={classes.address}>

View File

@ -83,7 +83,7 @@ const SafeName = ({ classes }: Props) => (
const SafeNameForm = withStyles(styles)(SafeName)
const SafeNamePage = () => (controls: React.Node) => (
<OpenPaper controls={controls} container={600}>
<OpenPaper controls={controls}>
<SafeNameForm />
</OpenPaper>
)