Welcome screen, Load Safe improvements rebranding WIP
This commit is contained in:
parent
b544be0ce2
commit
caf8b5e080
|
@ -36,7 +36,7 @@ const styles = () => ({
|
||||||
})
|
})
|
||||||
|
|
||||||
const ConnectDetails = ({ classes, onConnect }: Props) => (
|
const ConnectDetails = ({ classes, onConnect }: Props) => (
|
||||||
<React.Fragment>
|
<>
|
||||||
<div className={classes.container}>
|
<div className={classes.container}>
|
||||||
<Row margin="lg" align="center">
|
<Row margin="lg" align="center">
|
||||||
<Paragraph className={classes.text} size="lg" noMargin weight="bolder">
|
<Paragraph className={classes.text} size="lg" noMargin weight="bolder">
|
||||||
|
@ -54,7 +54,7 @@ const ConnectDetails = ({ classes, onConnect }: Props) => (
|
||||||
</Paragraph>
|
</Paragraph>
|
||||||
</Button>
|
</Button>
|
||||||
</Row>
|
</Row>
|
||||||
</React.Fragment>
|
</>
|
||||||
)
|
)
|
||||||
|
|
||||||
export default withStyles(styles)(ConnectDetails)
|
export default withStyles(styles)(ConnectDetails)
|
||||||
|
|
|
@ -167,8 +167,8 @@ const UserDetails = ({
|
||||||
<Hairline margin="xs" />
|
<Hairline margin="xs" />
|
||||||
<Row className={classes.disconnect}>
|
<Row className={classes.disconnect}>
|
||||||
<Button onClick={onDisconnect} size="medium" variant="contained" color="primary" fullWidth>
|
<Button onClick={onDisconnect} size="medium" variant="contained" color="primary" fullWidth>
|
||||||
<Paragraph className={classes.disconnectText} size="sm" weight="bold" color="white" noMargin>
|
<Paragraph className={classes.disconnectText} size="md" color="white" noMargin>
|
||||||
DISCONNECT
|
Disconnect
|
||||||
</Paragraph>
|
</Paragraph>
|
||||||
</Button>
|
</Button>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
|
@ -8,6 +8,7 @@ import { sm, boldFont } from '~/theme/variables'
|
||||||
const controlStyle = {
|
const controlStyle = {
|
||||||
backgroundColor: 'white',
|
backgroundColor: 'white',
|
||||||
padding: sm,
|
padding: sm,
|
||||||
|
borderRadius: sm,
|
||||||
}
|
}
|
||||||
|
|
||||||
const firstButtonStyle = {
|
const firstButtonStyle = {
|
||||||
|
|
|
@ -11,9 +11,6 @@ const styles = () => ({
|
||||||
maxWidth: '870px',
|
maxWidth: '870px',
|
||||||
boxShadow: '0 0 10px 0 rgba(33,48,77,0.10)',
|
boxShadow: '0 0 10px 0 rgba(33,48,77,0.10)',
|
||||||
},
|
},
|
||||||
container: {
|
|
||||||
letterSpacing: '-0.5px',
|
|
||||||
},
|
|
||||||
padding: {
|
padding: {
|
||||||
padding: lg,
|
padding: lg,
|
||||||
},
|
},
|
||||||
|
|
|
@ -118,7 +118,7 @@ const GnoStepper = (props: Props) => {
|
||||||
const penultimate = isLastPage(page + 1)
|
const penultimate = isLastPage(page + 1)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<>
|
||||||
<GnoForm
|
<GnoForm
|
||||||
onSubmit={handleSubmit}
|
onSubmit={handleSubmit}
|
||||||
initialValues={values}
|
initialValues={values}
|
||||||
|
@ -129,7 +129,7 @@ const GnoStepper = (props: Props) => {
|
||||||
{(submitting: boolean, validating: boolean, ...rest: any) => {
|
{(submitting: boolean, validating: boolean, ...rest: any) => {
|
||||||
const disabled = disabledWhenValidating ? submitting || validating : submitting
|
const disabled = disabledWhenValidating ? submitting || validating : submitting
|
||||||
const controls = (
|
const controls = (
|
||||||
<React.Fragment>
|
<>
|
||||||
<Hairline />
|
<Hairline />
|
||||||
<Controls
|
<Controls
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
|
@ -138,12 +138,12 @@ const GnoStepper = (props: Props) => {
|
||||||
lastPage={lastPage}
|
lastPage={lastPage}
|
||||||
penultimate={penultimate}
|
penultimate={penultimate}
|
||||||
/>
|
/>
|
||||||
</React.Fragment>
|
</>
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stepper classes={{ root: classes.root }} activeStep={page} orientation="vertical">
|
<Stepper classes={{ root: classes.root }} activeStep={page} orientation="vertical">
|
||||||
{steps.map(label => (
|
{steps.map((label) => (
|
||||||
<FormStep key={label}>
|
<FormStep key={label}>
|
||||||
<StepLabel>{label}</StepLabel>
|
<StepLabel>{label}</StepLabel>
|
||||||
<StepContent TransitionProps={transitionProps}>{activePage(controls, ...rest)}</StepContent>
|
<StepContent TransitionProps={transitionProps}>{activePage(controls, ...rest)}</StepContent>
|
||||||
|
@ -153,7 +153,7 @@ const GnoStepper = (props: Props) => {
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
</GnoForm>
|
</GnoForm>
|
||||||
</React.Fragment>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ const calculateStyleBased = (minWidth, minHeight) => ({
|
||||||
})
|
})
|
||||||
|
|
||||||
const GnoButton = ({
|
const GnoButton = ({
|
||||||
minWidth, minHeight = 27, testId = '', style = {}, ...props
|
minWidth, minHeight = 35, testId = '', style = {}, ...props
|
||||||
}: Props) => {
|
}: Props) => {
|
||||||
const calculatedStyle = calculateStyleBased(minWidth, minHeight)
|
const calculatedStyle = calculateStyleBased(minWidth, minHeight)
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,8 @@ import { border } from '~/theme/variables'
|
||||||
|
|
||||||
const calculateStyleFrom = (color?: string, margin?: Size) => ({
|
const calculateStyleFrom = (color?: string, margin?: Size) => ({
|
||||||
width: '100%',
|
width: '100%',
|
||||||
minHeight: '1px',
|
minHeight: '2px',
|
||||||
height: '1px',
|
height: '2px',
|
||||||
backgroundColor: color || border,
|
backgroundColor: color || border,
|
||||||
margin: `${getSize(margin)} 0px`,
|
margin: `${getSize(margin)} 0px`,
|
||||||
})
|
})
|
||||||
|
|
|
@ -6,15 +6,15 @@
|
||||||
|
|
||||||
.h1 {
|
.h1 {
|
||||||
line-height: 36px;
|
line-height: 36px;
|
||||||
font-weight: $bolderFont;
|
font-weight: $extraBoldFont;
|
||||||
letter-spacing: -1px;
|
letter-spacing: 1.13px;
|
||||||
font-size: $(fontSizeHeadingLg)px;
|
font-size: $(fontSizeHeadingLg)px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h2 {
|
.h2 {
|
||||||
line-height: 28px;
|
line-height: 26px;
|
||||||
font-weight: $bolderFont;
|
letter-spacing: normal;
|
||||||
letter-spacing: -0.5px;
|
line-height: 1.3;
|
||||||
font-size: $(fontSizeHeadingMd)px;
|
font-size: $(fontSizeHeadingMd)px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
.paragraph {
|
.paragraph {
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
overflow-x: inherit;
|
overflow-x: inherit;
|
||||||
|
line-height: 1.38;
|
||||||
}
|
}
|
||||||
|
|
||||||
.soft {
|
.soft {
|
||||||
|
|
|
@ -85,7 +85,7 @@ export const safeFieldsValidation = async (values: Object) => {
|
||||||
const Details = ({ classes, errors, form }: Props) => (
|
const Details = ({ classes, errors, form }: Props) => (
|
||||||
<>
|
<>
|
||||||
<Block margin="sm">
|
<Block margin="sm">
|
||||||
<Paragraph noMargin size="md" color="primary">
|
<Paragraph noMargin size="lg" color="primary">
|
||||||
Adding an existing Safe only requires the Safe address. Optionally you can give it a name. In case your
|
Adding an existing Safe only requires the Safe address. Optionally you can give it a name. In case your
|
||||||
connected client is not the owner of the Safe, the interface will essentially provide you a read-only view.
|
connected client is not the owner of the Safe, the interface will essentially provide you a read-only view.
|
||||||
</Paragraph>
|
</Paragraph>
|
||||||
|
|
|
@ -58,19 +58,19 @@ export const LoadSafe = ({ size, provider }: SafeProps) => (
|
||||||
|
|
||||||
const Welcome = ({ provider }: Props) => (
|
const Welcome = ({ provider }: Props) => (
|
||||||
<Block className={styles.safe}>
|
<Block className={styles.safe}>
|
||||||
<Heading tag="h1" align="center" margin="lg">
|
<Heading tag="h1" weight="bold" align="center" margin="lg">
|
||||||
Welcome to the Gnosis
|
Welcome to the Gnosis
|
||||||
<br />
|
<br />
|
||||||
Safe Team Edition
|
Safe Team Edition
|
||||||
</Heading>
|
</Heading>
|
||||||
<Heading tag="h4" align="center" margin="xl">
|
<Heading tag="h3" align="center" margin="xl">
|
||||||
The Gnosis Safe Team Edition is geared towards teams managing
|
The Gnosis Safe for Teams is geared towards teams managing shared
|
||||||
<br />
|
<br />
|
||||||
shared crypto funds. It is an improvement of the existing Gnosis
|
crypto funds. It is an improvement of the existing Gnosis MultiSig
|
||||||
<br />
|
<br />
|
||||||
MultiSig wallet with redesigned smart contracts, cheaper setup and
|
wallet with redesigned smart contracts, cheaper setup and transaction
|
||||||
<br />
|
<br />
|
||||||
transaction costs as well as an enhanced user experience.
|
costs as well as an enhanced user experience.
|
||||||
</Heading>
|
</Heading>
|
||||||
<Block className={styles.safeActions} margin="md">
|
<Block className={styles.safeActions} margin="md">
|
||||||
<CreateSafe size="large" provider={provider} />
|
<CreateSafe size="large" provider={provider} />
|
||||||
|
|
|
@ -8,6 +8,7 @@ import {
|
||||||
primary,
|
primary,
|
||||||
secondary,
|
secondary,
|
||||||
error,
|
error,
|
||||||
|
sm,
|
||||||
md,
|
md,
|
||||||
lg,
|
lg,
|
||||||
bolderFont,
|
bolderFont,
|
||||||
|
@ -54,6 +55,7 @@ export default createMuiTheme({
|
||||||
color: disabled,
|
color: disabled,
|
||||||
},
|
},
|
||||||
color: disabled,
|
color: disabled,
|
||||||
|
textTransform: 'none',
|
||||||
borderRadius: '8px',
|
borderRadius: '8px',
|
||||||
},
|
},
|
||||||
contained: {
|
contained: {
|
||||||
|
@ -75,7 +77,6 @@ export default createMuiTheme({
|
||||||
padding: `${md} ${lg}`,
|
padding: `${md} ${lg}`,
|
||||||
minHeight: '52px',
|
minHeight: '52px',
|
||||||
fontSize: buttonLargeFontSize,
|
fontSize: buttonLargeFontSize,
|
||||||
fontWeight: boldFont,
|
|
||||||
},
|
},
|
||||||
sizeSmall: {
|
sizeSmall: {
|
||||||
minWidth: '130px',
|
minWidth: '130px',
|
||||||
|
@ -87,6 +88,11 @@ export default createMuiTheme({
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
MuiPaper: {
|
||||||
|
rounded: {
|
||||||
|
borderRadius: sm,
|
||||||
|
},
|
||||||
|
},
|
||||||
MuiStepper: {
|
MuiStepper: {
|
||||||
root: {
|
root: {
|
||||||
padding: '24px 0 0 15px',
|
padding: '24px 0 0 15px',
|
||||||
|
|
|
@ -36,18 +36,19 @@ module.exports = {
|
||||||
border,
|
border,
|
||||||
marginButtonImg,
|
marginButtonImg,
|
||||||
fontSizeHeadingXs: 13,
|
fontSizeHeadingXs: 13,
|
||||||
fontSizeHeadingSm: 18,
|
fontSizeHeadingSm: 16,
|
||||||
fontSizeHeadingMd: 21,
|
fontSizeHeadingMd: 20,
|
||||||
fontSizeHeadingLg: 32,
|
fontSizeHeadingLg: 32,
|
||||||
buttonLargeFontSize: '12px',
|
buttonLargeFontSize: '16px',
|
||||||
lightFont: 300,
|
lightFont: 300,
|
||||||
regularFont: 400,
|
regularFont: 400,
|
||||||
bolderFont: 500,
|
bolderFont: 500,
|
||||||
boldFont: 700,
|
boldFont: 700,
|
||||||
|
extraBoldFont: 800,
|
||||||
smallFontSize: '11px',
|
smallFontSize: '11px',
|
||||||
mediumFontSize: '13px',
|
mediumFontSize: '12px',
|
||||||
largeFontSize: '15px',
|
largeFontSize: '16px',
|
||||||
extraLargeFontSize: '18px',
|
extraLargeFontSize: '20px',
|
||||||
xxlFontSize: '32px',
|
xxlFontSize: '32px',
|
||||||
screenXs: 480,
|
screenXs: 480,
|
||||||
screenXsMax: 767,
|
screenXsMax: 767,
|
||||||
|
|
Loading…
Reference in New Issue