Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix color and font related issue for the catalog modal #819

Merged
merged 3 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/custom/CatalogDetail/CollapsibleSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ const CollapsibleSection: React.FC<CollapsibleSectionProps> = ({
<InfoTooltip helpText={tooltip} />
{isOpen ? <ExpandLessIcon /> : <ExpandMoreIcon />}
</SideTitleButton>
<Collapse sx={{ width: '100%' }} in={isOpen} timeout="auto" unmountOnExit>
<Collapse
sx={{ width: '100%', fontFamily: 'inherit' }}
in={isOpen}
timeout="auto"
unmountOnExit
>
{items && items.length > 0 ? (
<List component="div" sx={{ width: '100%', padding: '0.5rem' }} disablePadding>
{items?.map(renderItem)}
Expand All @@ -50,6 +55,9 @@ const CollapsibleSection: React.FC<CollapsibleSectionProps> = ({
opacity: 0.8,
padding: '7px'
}}
primaryTypographyProps={{
fontFamily: 'inherit'
}}
primary={emptyState}
/>
)}
Expand Down
15 changes: 8 additions & 7 deletions src/custom/CatalogDetail/SocialSharePopper.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Box, IconButton, Menu, MenuItem, Tooltip } from '@mui/material';
import { Box, IconButton, Menu, MenuItem } from '@mui/material';
import React, { useState } from 'react';
import { FacebookShareButton, LinkedinShareButton, TwitterShareButton } from 'react-share';
import { ChainIcon, FacebookIcon, LinkedinIcon, ShareIcon, TwitterIcon } from '../../icons';
import { useTheme } from '../../theme';
import { Pattern } from '../CustomCatalog/CustomCard';
import { CustomTooltip } from '../CustomTooltip';
import { ErrorBoundary } from '../ErrorBoundary';
import { CopyShareIconWrapper, VisibilityChip } from './style';

Expand Down Expand Up @@ -50,23 +51,23 @@ const SocialSharePopper: React.FC<SocialSharePopperProps> = ({
</VisibilityChip>

{details?.visibility !== 'private' && (
<Tooltip title="Copy Link" placement="top" arrow>
<CustomTooltip title="Copy Link" placement="top" arrow>
<IconButton
sx={{ borderRadius: '0.1rem', padding: '0.5rem' }}
onClick={() => handleCopyUrl(cleanedType, details?.name, details?.id)}
>
<ChainIcon height={'24'} width={'24'} />
<ChainIcon height={'24'} width={'24'} fill={theme.palette.icon.secondary} />
</IconButton>
</Tooltip>
</CustomTooltip>
)}

{(details?.visibility === 'published' || details?.visibility === 'public') && (
<>
<Tooltip title={title} placement="top" arrow>
<CustomTooltip title={title} placement="top" arrow>
<IconButton sx={{ borderRadius: '0.1rem', padding: '0.5rem' }} onClick={handleClick}>
<ShareIcon height={24} width={22} />
<ShareIcon height={24} width={22} fill={theme.palette.icon.secondary} />
</IconButton>
</Tooltip>
</CustomTooltip>

<Menu
anchorEl={anchorEl}
Expand Down
4 changes: 2 additions & 2 deletions src/custom/CatalogDetail/style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ export const MetricsType = styled('div')(({ theme }) => ({
letterSpacing: '0.15px',
lineHeight: '1.5',
textTransform: 'lowercase',
color: theme.palette.background.supplementary,
color: theme.palette.icon.secondary,
[' @media (max-width: 285px)']: {
fontSize: '0.86rem'
}
}));
export const MetricsData = styled('div')(({ theme }) => ({
color: theme.palette.background.supplementary,
color: theme.palette.icon.secondary,
fontSize: '1.2rem',
fontWeight: 'bold',
lineHeight: '1.5'
Expand Down
5 changes: 5 additions & 0 deletions src/custom/InputSearchField/InputSearchField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ const InputSearchField: React.FC<InputSearchFieldProps> = ({
error={!!error}
helperText={error}
fullWidth
InputLabelProps={{
style: {
fontFamily: 'inherit'
}
}}
InputProps={{
...params.InputProps,
endAdornment: (
Expand Down
36 changes: 24 additions & 12 deletions src/custom/Markdown/style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ export const StyledMarkdown = styled('a')(({ theme }) => ({
'&:hover': {
textDecoration: 'underline'
},
cursor: 'pointer'
cursor: 'pointer',
fontFamily: 'inherit'
}));

// anchor style for notifications markdown content
Expand All @@ -28,31 +29,38 @@ export const StyledMarkdownP = styled('p')(({ theme }) => ({

export const StyledMarkdownTooltipP = styled('p')(({ theme }) => ({
color: theme.palette.text.constant?.white || text.inverse,
marginBlock: '0px'
marginBlock: '0px',
fontFamily: 'inherit'
}));

export const StyledMarkdownH1 = styled('h1')(({ theme }) => ({
color: theme.palette.text.default
color: theme.palette.text.default,
fontFamily: 'inherit'
}));

export const StyledMarkdownH2 = styled('h2')(({ theme }) => ({
color: theme.palette.text.default
color: theme.palette.text.default,
fontFamily: 'inherit'
}));

export const StyledMarkdownH3 = styled('h3')(({ theme }) => ({
color: theme.palette.text.default
color: theme.palette.text.default,
fontFamily: 'inherit'
}));

export const StyledMarkdownH4 = styled('h4')(({ theme }) => ({
color: theme.palette.text.default
color: theme.palette.text.default,
fontFamily: 'inherit'
}));

export const StyledMarkdownH5 = styled('h5')(({ theme }) => ({
color: theme.palette.text.default
color: theme.palette.text.default,
fontFamily: 'inherit'
}));

export const StyledMarkdownH6 = styled('h6')(({ theme }) => ({
color: theme.palette.text.default
color: theme.palette.text.default,
fontFamily: 'inherit'
}));

export const StyledMarkdownBlockquote = styled('blockquote')(({ theme }) => ({
Expand All @@ -67,22 +75,26 @@ export const StyledMarkdownUl = styled('ul')(({ theme }) => ({

export const StyledMarkdownLi = styled('li')(({ theme }) => ({
color: theme.palette.text.default,
...theme.typography.textB1Regular
...theme.typography.textB1Regular,
fontFamily: 'inherit'
}));

export const StyledMarkdownTh = styled('th')(({ theme }) => ({
color: theme.palette.text.default,
...theme.typography.textH3Medium,
marginBlock: '0px'
marginBlock: '0px',
fontFamily: 'inherit'
}));

export const StyledMarkdownTd = styled('td')(({ theme }) => ({
color: theme.palette.text.default,
marginBlock: '0px',
...theme.typography.textB1Regular
...theme.typography.textB1Regular,
fontFamily: 'inherit'
}));

export const StyledMarkdownPre = styled('pre')(({ theme }) => ({
background: theme.palette.background.code,
whiteSpace: 'pre-line'
whiteSpace: 'pre-line',
fontFamily: 'inherit'
}));
5 changes: 5 additions & 0 deletions src/custom/UserSearchField/UserSearchFieldInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ const UserSearchField: React.FC<UserSearchFieldProps> = ({
label={label}
error={!!error}
helperText={error}
InputLabelProps={{
style: {
fontFamily: 'inherit'
}
}}
InputProps={{
...params.InputProps,
endAdornment: (
Expand Down
Loading