Skip to content

Commit

Permalink
fix tabs styles
Browse files Browse the repository at this point in the history
  • Loading branch information
SorinC6 committed May 9, 2024
1 parent 32624de commit f4a2634
Show file tree
Hide file tree
Showing 4 changed files with 317 additions and 315 deletions.
45 changes: 22 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import classNames from 'classnames';
import styles from './SubMenuItem.scss';
import { Box } from '@mui/material';
import { withLayout } from '../../styles/context/layout';
import { Typography } from '@mui/material';

type Props = {|
+label: string,
Expand Down Expand Up @@ -45,7 +46,9 @@ class SubMenuItem extends Component<Props & InjectedProps> {
onClick={onClick}
id={locationId + '-' + subMenuItemId + 'SubTab-button'}
>
{label}
<Typography variant="body1" fontWeight="500">
{label}
</Typography>
</Box>
);
}
Expand Down
30 changes: 17 additions & 13 deletions packages/yoroi-extension/app/components/wallet/assets/NFTDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ import useMediaQuery from '@mui/material/useMediaQuery';
import { Link } from 'react-router-dom';
import { ROUTES } from '../../../routes-config';
import { getNetworkUrl, tokenMessages } from './TokenDetails';
import type { CardanoAssetMintMetadata, NetworkRow, } from '../../../api/ada/lib/storage/database/primitives/tables';
import type {
CardanoAssetMintMetadata,
NetworkRow,
} from '../../../api/ada/lib/storage/database/primitives/tables';
import { NftImage } from './NFTsList';
import { isCardanoHaskell } from '../../../api/ada/lib/storage/database/prepackaged/networks';
import { truncateAddress, truncateAddressShort } from '../../../utils/formatters';
Expand Down Expand Up @@ -149,15 +152,13 @@ function NFTDetails({ nftInfo, network, intl, nextNftId, prevNftId, tab }: Props
to={ROUTES.NFTS.ROOT}
sx={{
color: 'grayscale.900',
lineHeight: '27.5px',
fontSize: '14px',
'&.MuiButton-sizeMedium': {
padding: '13px 16px',
},
}}
startIcon={<BackArrow />}
>
{intl.formatMessage(messages.back)}
<Typography fontWeight="500">{intl.formatMessage(messages.back)}</Typography>
</Button>
<Grid
container
Expand All @@ -181,12 +182,7 @@ function NFTDetails({ nftInfo, network, intl, nextNftId, prevNftId, tab }: Props
}}
onClick={() => nftImage !== null && setOpenAndTrack()}
>
<NftImage
imageUrl={nftImage}
name={nftInfo.name || '-'}
width="100%"
height="auto"
/>
<NftImage imageUrl={nftImage} name={nftInfo.name || '-'} width="100%" height="auto" />
</ImageItem>
</Grid>

Expand Down Expand Up @@ -276,7 +272,11 @@ function NFTDetails({ nftInfo, network, intl, nextNftId, prevNftId, tab }: Props
textTransform: 'none',
fontWeight: 500,
}}
label={intl.formatMessage(label)}
label={
<Typography variant="body1" fontWeight="500" pb="6px">
{intl.formatMessage(label)}
</Typography>
}
value={id}
disableRipple
/>
Expand Down Expand Up @@ -427,8 +427,12 @@ const ImageItem = styled(Box)({
function LabelWithValue({ label, value }: {| label: string | Node, value: string | Node |}): Node {
return (
<Box>
<Typography component="div" color="var(--yoroi-palette-gray-600)">{label}</Typography>
<Typography component="div" color="var(--yoroi-palette-gray-900)">{value}</Typography>
<Typography component="div" color="var(--yoroi-palette-gray-600)">
{label}
</Typography>
<Typography component="div" color="var(--yoroi-palette-gray-900)">
{value}
</Typography>
</Box>
);
}

0 comments on commit f4a2634

Please sign in to comment.