fix: small component fixes

This commit is contained in:
Taranto 2020-08-10 11:51:21 +01:00 committed by Josh Harvey
parent 0b28e7f98a
commit b153a23f25
7 changed files with 23 additions and 9 deletions

View file

@ -33,7 +33,7 @@ const useStyles = makeStyles({
marginRight: spacer / 4, marginRight: spacer / 4,
marginBottom: spacer / 2, marginBottom: spacer / 2,
marginLeft: spacer / 4, marginLeft: spacer / 4,
height: 18, height: spacer * 3,
backgroundColor: ({ type }) => backgroundColors[type] backgroundColor: ({ type }) => backgroundColors[type]
}, },
label: { label: {

View file

@ -100,6 +100,7 @@ const ECol = ({
width, width,
textAlign, textAlign,
suffix, suffix,
SuffixComponent = TL2,
view = it => it?.toString(), view = it => it?.toString(),
inputProps = {} inputProps = {}
} = config } = config
@ -137,7 +138,9 @@ const ECol = ({
) : ( ) : (
values && <>{view(values[name])}</> values && <>{view(values[name])}</>
)} )}
{suffix && <TL2 className={classes.suffix}>{suffix}</TL2>} {suffix && (
<SuffixComponent className={classes.suffix}>{suffix}</SuffixComponent>
)}
</Td> </Td>
) )
} }

View file

@ -10,11 +10,11 @@ import {
white white
} from 'src/styling/variables' } from 'src/styling/variables'
const { label2 } = typographyStyles const { tl2 } = typographyStyles
const useStyles = makeStyles({ const useStyles = makeStyles({
th: { th: {
extend: label2, extend: tl2,
backgroundColor: tableHeaderColor, backgroundColor: tableHeaderColor,
height: tableHeaderHeight, height: tableHeaderHeight,
textAlign: 'left', textAlign: 'left',

View file

@ -20,6 +20,7 @@ import {
Label1, Label1,
Label3 Label3
} from 'src/components/typography' } from 'src/components/typography'
import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard'
import { primaryColor } from 'src/styling/variables' import { primaryColor } from 'src/styling/variables'
import styles from './Funding.styles' import styles from './Funding.styles'
@ -199,7 +200,11 @@ const Funding = () => {
<H3 className={classes.topSpacer}>Address</H3> <H3 className={classes.topSpacer}>Address</H3>
<div className={classes.addressWrapper}> <div className={classes.addressWrapper}>
<Mono className={classes.address}> <Mono className={classes.address}>
<strong>{formatAddress(selected.fundingAddress)}</strong> <strong>
<CopyToClipboard buttonClassname={classes.copyToClipboard}>
{formatAddress(selected.fundingAddress)}
</CopyToClipboard>
</strong>
</Mono> </Mono>
</div> </div>
</div> </div>

View file

@ -85,5 +85,11 @@ export default {
}, },
pending: { pending: {
backgroundColor: disabledColor2 backgroundColor: disabledColor2
},
copyToClipboard: {
marginLeft: 'auto',
paddingTop: 6,
paddingLeft: 15,
marginRight: -11
} }
} }

View file

@ -17,7 +17,7 @@ import {
TableBody, TableBody,
TableCell TableCell
} from 'src/components/table' } from 'src/components/table'
import { Info3 } from 'src/components/typography' import { Label1, Info3 } from 'src/components/typography'
import { ReactComponent as WhiteShareIcon } from 'src/styling/icons/circle buttons/share/white.svg' import { ReactComponent as WhiteShareIcon } from 'src/styling/icons/circle buttons/share/white.svg'
import { ReactComponent as ShareIcon } from 'src/styling/icons/circle buttons/share/zodiac.svg' import { ReactComponent as ShareIcon } from 'src/styling/icons/circle buttons/share/zodiac.svg'
@ -118,7 +118,7 @@ const Logs = () => {
Icon={ShareIcon} Icon={ShareIcon}
InverseIcon={WhiteShareIcon} InverseIcon={WhiteShareIcon}
onClick={sendSnapshot}> onClick={sendSnapshot}>
Share with Lamassu <Label1>Share with Lamassu</Label1>
</SimpleButton> </SimpleButton>
<Info3>{saveMessage}</Info3> <Info3>{saveMessage}</Info3>
</div> </div>

View file

@ -18,7 +18,7 @@ import {
TableBody, TableBody,
TableCell TableCell
} from 'src/components/table' } from 'src/components/table'
import { Info3 } from 'src/components/typography' import { Label1, Info3 } from 'src/components/typography'
import typographyStyles from 'src/components/typography/styles' import typographyStyles from 'src/components/typography/styles'
import { ReactComponent as WhiteShareIcon } from 'src/styling/icons/circle buttons/share/white.svg' import { ReactComponent as WhiteShareIcon } from 'src/styling/icons/circle buttons/share/white.svg'
import { ReactComponent as ShareIcon } from 'src/styling/icons/circle buttons/share/zodiac.svg' import { ReactComponent as ShareIcon } from 'src/styling/icons/circle buttons/share/zodiac.svg'
@ -128,7 +128,7 @@ const Logs = () => {
Icon={ShareIcon} Icon={ShareIcon}
InverseIcon={WhiteShareIcon} InverseIcon={WhiteShareIcon}
onClick={sendSnapshot}> onClick={sendSnapshot}>
Share with Lamassu <Label1>Share with Lamassu</Label1>
</SimpleButton> </SimpleButton>
<Info3>{saveMessage}</Info3> <Info3>{saveMessage}</Info3>
</div> </div>