mirror of
https://github.com/trezor/trezor-wallet
synced 2024-12-30 19:00:53 +00:00
Unify labels in section
This commit is contained in:
parent
8ed59317c7
commit
3b374e424e
@ -18,10 +18,9 @@ const disabledColor = colors.TEXT_PRIMARY;
|
|||||||
const StyledTextarea = styled(Textarea)`
|
const StyledTextarea = styled(Textarea)`
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 85px;
|
min-height: 85px;
|
||||||
margin-bottom: 10px;
|
|
||||||
padding: 10px 12px;
|
padding: 10px 12px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
border: 1px solid ${props => (props.borderColor ? props.borderColor : colors.DIVIDER)};
|
border: 1px solid ${props => (props.colorBorder ? props.colorBorder : colors.DIVIDER)};
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
resize: none;
|
resize: none;
|
||||||
outline: none;
|
outline: none;
|
||||||
@ -95,7 +94,7 @@ const StyledTextarea = styled(Textarea)`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
const TopLabel = styled.span`
|
const TopLabel = styled.span`
|
||||||
padding-bottom: 4px;
|
padding-bottom: 8px;
|
||||||
color: ${colors.TEXT_SECONDARY};
|
color: ${colors.TEXT_SECONDARY};
|
||||||
`;
|
`;
|
||||||
|
|
||||||
@ -159,6 +158,7 @@ const TextArea = ({
|
|||||||
state = '',
|
state = '',
|
||||||
bottomText = '',
|
bottomText = '',
|
||||||
trezorAction = null,
|
trezorAction = null,
|
||||||
|
...rest
|
||||||
}) => (
|
}) => (
|
||||||
<Wrapper className={className}>
|
<Wrapper className={className}>
|
||||||
{topLabel && (
|
{topLabel && (
|
||||||
@ -179,8 +179,7 @@ const TextArea = ({
|
|||||||
value={value}
|
value={value}
|
||||||
placeholder={placeholder}
|
placeholder={placeholder}
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
borderColor={getColor(state)}
|
{... rest}
|
||||||
trezorAction={trezorAction}
|
|
||||||
/>
|
/>
|
||||||
<TrezorAction action={trezorAction}>
|
<TrezorAction action={trezorAction}>
|
||||||
<ArrowUp />{trezorAction}
|
<ArrowUp />{trezorAction}
|
||||||
|
@ -29,7 +29,7 @@ const InputIconWrapper = styled.div`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
const TopLabel = styled.span`
|
const TopLabel = styled.span`
|
||||||
padding-bottom: 10px;
|
padding-bottom: 8px;
|
||||||
color: ${colors.TEXT_SECONDARY};
|
color: ${colors.TEXT_SECONDARY};
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ const Content = ({
|
|||||||
);
|
);
|
||||||
|
|
||||||
Content.propTypes = {
|
Content.propTypes = {
|
||||||
children: PropTypes.element,
|
children: PropTypes.oneOfType([PropTypes.element, PropTypes.array]),
|
||||||
isLoading: PropTypes.bool,
|
isLoading: PropTypes.bool,
|
||||||
title: PropTypes.string,
|
title: PropTypes.string,
|
||||||
message: PropTypes.string,
|
message: PropTypes.string,
|
||||||
|
@ -248,7 +248,6 @@ LeftNavigation.propTypes = {
|
|||||||
wallet: PropTypes.object,
|
wallet: PropTypes.object,
|
||||||
devices: PropTypes.array,
|
devices: PropTypes.array,
|
||||||
pending: PropTypes.array,
|
pending: PropTypes.array,
|
||||||
|
|
||||||
toggleDeviceDropdown: PropTypes.func,
|
toggleDeviceDropdown: PropTypes.func,
|
||||||
addAccount: PropTypes.func,
|
addAccount: PropTypes.func,
|
||||||
acquireDevice: PropTypes.func,
|
acquireDevice: PropTypes.func,
|
||||||
|
@ -8,7 +8,7 @@ const Wrapper = styled.div`
|
|||||||
font-size: ${FONT_SIZE.WALLET_TITLE};
|
font-size: ${FONT_SIZE.WALLET_TITLE};
|
||||||
font-weight: ${FONT_WEIGHT.BASE};
|
font-weight: ${FONT_WEIGHT.BASE};
|
||||||
color: ${colors.WALLET_TITLE};
|
color: ${colors.WALLET_TITLE};
|
||||||
padding-bottom: 25px;
|
padding-bottom: 35px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const Title = ({
|
const Title = ({
|
||||||
|
@ -20,7 +20,7 @@ const Wrapper = styled.div`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
const Row = styled.div`
|
const Row = styled.div`
|
||||||
padding: 0 0 10px 0;
|
padding: 0 0 25px 0;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const RowButtons = styled(Row)`
|
const RowButtons = styled(Row)`
|
||||||
@ -108,8 +108,8 @@ class SignVerify extends Component<Props, State> {
|
|||||||
<Wrapper>
|
<Wrapper>
|
||||||
<Sign>
|
<Sign>
|
||||||
<Row>
|
<Row>
|
||||||
<Label>Address</Label>
|
|
||||||
<Input
|
<Input
|
||||||
|
topLabel="Address"
|
||||||
name="signAddress"
|
name="signAddress"
|
||||||
value={account.address}
|
value={account.address}
|
||||||
height={50}
|
height={50}
|
||||||
@ -119,8 +119,8 @@ class SignVerify extends Component<Props, State> {
|
|||||||
/>
|
/>
|
||||||
</Row>
|
</Row>
|
||||||
<Row>
|
<Row>
|
||||||
<Label>Message</Label>
|
|
||||||
<Textarea
|
<Textarea
|
||||||
|
topLabel="Message"
|
||||||
name="signMessage"
|
name="signMessage"
|
||||||
value={this.state.signMessage}
|
value={this.state.signMessage}
|
||||||
onChange={this.handleInputChange}
|
onChange={this.handleInputChange}
|
||||||
@ -130,8 +130,8 @@ class SignVerify extends Component<Props, State> {
|
|||||||
/>
|
/>
|
||||||
</Row>
|
</Row>
|
||||||
<Row>
|
<Row>
|
||||||
<Label>Signature</Label>
|
|
||||||
<Textarea
|
<Textarea
|
||||||
|
topLabel="Signature"
|
||||||
name="signSignature"
|
name="signSignature"
|
||||||
value={signature}
|
value={signature}
|
||||||
rows={4}
|
rows={4}
|
||||||
@ -154,8 +154,8 @@ class SignVerify extends Component<Props, State> {
|
|||||||
</Sign>
|
</Sign>
|
||||||
<Verify>
|
<Verify>
|
||||||
<Row>
|
<Row>
|
||||||
<Label>Address</Label>
|
|
||||||
<Input
|
<Input
|
||||||
|
topLabel="Address"
|
||||||
name="verifyAddress"
|
name="verifyAddress"
|
||||||
value={this.state.verifyAddress}
|
value={this.state.verifyAddress}
|
||||||
onChange={this.handleInputChange}
|
onChange={this.handleInputChange}
|
||||||
@ -166,8 +166,8 @@ class SignVerify extends Component<Props, State> {
|
|||||||
/>
|
/>
|
||||||
</Row>
|
</Row>
|
||||||
<Row>
|
<Row>
|
||||||
<Label>Message</Label>
|
|
||||||
<Textarea
|
<Textarea
|
||||||
|
topLabel="Message"
|
||||||
name="verifyMessage"
|
name="verifyMessage"
|
||||||
value={this.state.verifyMessage}
|
value={this.state.verifyMessage}
|
||||||
onChange={this.handleInputChange}
|
onChange={this.handleInputChange}
|
||||||
@ -177,8 +177,8 @@ class SignVerify extends Component<Props, State> {
|
|||||||
/>
|
/>
|
||||||
</Row>
|
</Row>
|
||||||
<Row>
|
<Row>
|
||||||
<Label>Signature</Label>
|
|
||||||
<Textarea
|
<Textarea
|
||||||
|
topLabel="Signature"
|
||||||
name="verifySignature"
|
name="verifySignature"
|
||||||
value={this.state.verifySignature}
|
value={this.state.verifySignature}
|
||||||
onChange={this.handleInputChange}
|
onChange={this.handleInputChange}
|
||||||
|
Loading…
Reference in New Issue
Block a user