Skip to content

Commit

Permalink
Merge pull request #756 from oasisprotocol/mz/typography
Browse files Browse the repository at this point in the history
Update typography in various places
  • Loading branch information
buberdds authored Jul 19, 2023
2 parents 9c4f5f3 + fa0e76e commit 40be1e3
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 17 deletions.
1 change: 1 addition & 0 deletions .changelog/756.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update typography in various places
2 changes: 1 addition & 1 deletion src/app/components/Account/ShowMoreTokensLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { accountTokenContainerId } from '../../pages/AccountDetailsPage/AccountT

export const StyledLink = styled(RouterLink)(({ theme }) => ({
color: COLORS.brandDark,
fontWeight: 600,
fontWeight: 700,
textDecoration: 'none',
whiteSpace: 'nowrap',
marginLeft: theme.spacing(4),
Expand Down
20 changes: 13 additions & 7 deletions src/app/components/ParaTimePicker/NetworkMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ import { COLORS } from '../../../styles/theme/colors'
import { Network, getNetworkNames } from '../../../types/network'
import { RouteUtils } from '../../utils/route-utils'
import { getNetworkIcons } from '../../utils/content'
import { styled } from '@mui/material/styles'

const StyledButton = styled(Button)(({ theme }) => ({
marginLeft: '48px',
color: COLORS.brandDark,
fontWeight: 700,
'&&:hover': {
textDecoration: 'none',
color: COLORS.brandDark,
},
}))

type NetworkMenuItemProps = Omit<NetworkMenuProps, 'options'> & {
divider: boolean
Expand Down Expand Up @@ -114,14 +125,9 @@ export const NetworkMenu: FC<NetworkMenuProps> = ({ activeNetwork, selectedNetwo
</Collapse>
</MenuList>
{!!filteredOptions.length && (
<Button
onClick={() => setExpandNetworkMenu(!expandNetworkMenu)}
size="small"
variant="text"
sx={{ ml: '48px' }}
>
<StyledButton onClick={() => setExpandNetworkMenu(!expandNetworkMenu)} size="small" variant="text">
{expandNetworkMenu ? t('paraTimePicker.less') : t('paraTimePicker.more')}
</Button>
</StyledButton>
)}
</>
)
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ParatimeDashboardPage/LatestBlocks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const LatestBlocks: FC<{ scope: SearchScope }> = ({ scope }) => {
<Link
component={RouterLink}
to={RouteUtils.getLatestBlocksRoute(scope)}
sx={{ color: COLORS.brandExtraDark }}
sx={{ color: COLORS.brandDark }}
>
{t('common.viewAll')}
</Link>
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ParatimeDashboardPage/LatestTransactions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const LatestTransactions: FC<{ scope: SearchScope }> = ({ scope }) => {
<Link
component={RouterLink}
to={RouteUtils.getLatestTransactionsRoute(scope)}
sx={{ color: COLORS.brandExtraDark }}
sx={{ color: COLORS.brandDark }}
>
{t('common.viewAll')}
</Link>
Expand Down
7 changes: 1 addition & 6 deletions src/app/pages/ParatimeDashboardPage/LearningMaterials.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,7 @@ export const LearningMaterials: FC<{ scope: SearchScope }> = ({ scope }) => {
component="h3"
title={t('learningMaterials.header')}
action={
<Link
href={docs.home}
rel="noopener noreferrer"
target="_blank"
sx={{ color: COLORS.brandExtraDark }}
>
<Link href={docs.home} rel="noopener noreferrer" target="_blank" sx={{ color: COLORS.brandDark }}>
{t('common.viewAll')}
</Link>
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ParatimeDashboardPage/TopTokens.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const TopTokens: FC<{ scope: SearchScope }> = ({ scope }) => {
<Link
component={RouterLink}
to={RouteUtils.getTopTokensRoute(scope)}
sx={{ color: COLORS.brandExtraDark }}
sx={{ color: COLORS.brandDark }}
>
{t('common.viewAll')}
</Link>
Expand Down

0 comments on commit 40be1e3

Please sign in to comment.