Skip to content

Commit a3063bc

Browse files
authored
Merge branch 'master' into pass-container
2 parents 732373b + 4abaca4 commit a3063bc

14 files changed

Lines changed: 52 additions & 11 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ Find out more on the <a href="https://layer5.io/community">Layer5 community</a>.
9191
<br /><br /><br /><br />
9292

9393
</p>
94-
9594
<div>&nbsp;</div>
9695

9796
<a href="https://slack.meshery.io">

src/custom/CatalogDetail/SocialSharePopper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const SocialSharePopper: React.FC<SocialSharePopperProps> = ({
8383
size="small"
8484
onClick={() => handleCopyUrl(cleanedType, details?.name, details?.id)}
8585
>
86-
<ChainIcon height={'24'} width={'24'} fill={theme.palette.icon.inverse} />
86+
<ChainIcon height={'24'} width={'24'} fill={theme.palette.text.constant?.white} />
8787
</ShareSideButton>
8888
</CustomTooltip>
8989
</ShareButtonGroup>

src/custom/Markdown/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
BasicAnchorMarkdown,
66
StyledMarkdown,
77
StyledMarkdownBlockquote,
8+
StyledMarkdownCode,
89
StyledMarkdownH1,
910
StyledMarkdownH2,
1011
StyledMarkdownH3,
@@ -54,7 +55,8 @@ export const RenderMarkdown: React.FC<RenderMarkdownProps> = ({ content }) => {
5455
li: ({ ...props }) => <StyledMarkdownLi>{props.children}</StyledMarkdownLi>,
5556
th: ({ ...props }) => <StyledMarkdownTh>{props.children}</StyledMarkdownTh>,
5657
td: ({ ...props }) => <StyledMarkdownTd>{props.children}</StyledMarkdownTd>,
57-
pre: ({ ...props }) => <StyledMarkdownPre>{props.children}</StyledMarkdownPre>
58+
pre: ({ ...props }) => <StyledMarkdownPre>{props.children}</StyledMarkdownPre>,
59+
code: ({ ...props }) => <StyledMarkdownCode>{props.children}</StyledMarkdownCode>
5860
}}
5961
>
6062
{content}

src/custom/Markdown/style.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,12 @@ export const StyledMarkdownPre = styled('pre')(({ theme }) => ({
9898
whiteSpace: 'pre-line',
9999
fontFamily: 'inherit'
100100
}));
101+
102+
export const StyledMarkdownCode = styled('code')(({ theme }) => ({
103+
background: theme.palette.background.code,
104+
whiteSpace: 'pre-line',
105+
padding: '1.5px',
106+
paddingInline: '5px',
107+
fontFamily: 'inherit',
108+
borderRadius: 3
109+
}));

src/custom/ShareModal/ShareModal.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,14 @@ const ShareModal: React.FC<ShareModalProps> = ({
257257
<PublicIcon
258258
width={24}
259259
height={24}
260+
fill={theme.palette.icon.default}
260261
stroke={theme.palette.mode === 'dark' ? WHITE : BLACK}
261262
/>
262263
) : (
263264
<LockIcon
264265
width={24}
265266
height={24}
267+
fill={theme.palette.icon.default}
266268
stroke={theme.palette.mode === 'dark' ? WHITE : BLACK}
267269
/>
268270
)}
@@ -289,7 +291,13 @@ const ShareModal: React.FC<ShareModalProps> = ({
289291
</MenuItem>
290292
))}
291293
</CustomSelect>
292-
<Typography component="span" variant="body2">
294+
<Typography
295+
sx={{
296+
color: theme.palette.text.secondary
297+
}}
298+
component="span"
299+
variant="body2"
300+
>
293301
{selectedOption === SHARE_MODE.PRIVATE ? options.PRIVATE : options.PUBLIC}
294302
</Typography>
295303
</div>

src/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ export * from './icons';
66
export * from './redux-persist';
77
export * from './schemas';
88
export * from './theme';
9+
export * from './utils';

src/theme/colors/colors.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ export const charcoal = {
102102
10: '#000D12'
103103
};
104104

105+
export const gray = {
106+
10: '#1A1A1A',
107+
20: '#212121'
108+
};
109+
105110
export const accentGrey = {
106111
100: '#F6F8F8',
107112
90: '#E8EFF3',

src/theme/colors/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757
darkSlateGray,
5858
darkTeal,
5959
eerieBlack,
60+
gray,
6061
green,
6162
jungleGreen,
6263
keppel,

src/theme/components/tab.modifier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const MuiTab: Components<Theme>['MuiTab'] = {
66
const {
77
palette: {
88
text: { default: defaultText },
9-
background: { default: defaultBackground }
9+
background: { tabs: defaultBackground }
1010
}
1111
} = theme;
1212
return {

src/theme/components/tabs.modifier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Components, Theme } from '@mui/material';
33
export const MuiTabs: Components<Theme>['MuiTabs'] = {
44
styleOverrides: {
55
root: ({ theme }) => ({
6-
backgroundColor: theme.palette.background.default
6+
backgroundColor: theme.palette.background.tabs
77
}),
88
indicator: ({ theme }) => ({
99
backgroundColor: theme.palette.background.brand?.default

0 commit comments

Comments
 (0)