Skip to content

Commit 16abd43

Browse files
authored
Merge branch 'master' into improve-modal-msgs
2 parents 54f2744 + ce50f92 commit 16abd43

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

src/custom/ChapterCard/style.tsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ALABASTER_WHITE, MIDNIGHT_BLACK } from '../../theme';
55
export const ChapterCardWrapper = styled('div')(({ theme }) => ({
66
transition: '0.8s cubic-bezier(0.2, 0.8, 0.2, 1)',
77
padding: '1rem 1.25rem',
8-
width: '64rem',
8+
width: '100%',
99
backgroundColor: theme.palette.mode === 'light' ? ALABASTER_WHITE : MIDNIGHT_BLACK,
1010
display: 'flex',
1111
border: `1px solid ${
@@ -45,15 +45,9 @@ export const ChapterDescription = styled('div')({
4545
},
4646
'@media screen and (max-width: 650px)': {
4747
p: {
48-
whiteSpace: 'nowrap',
48+
whiteSpace: 'normal',
4949
overflow: 'hidden',
50-
textOverflow: 'ellipsis',
51-
width: '75vw'
52-
}
53-
},
54-
'@media screen and (max-width: 650px) and (min-width: 300px)': {
55-
p: {
56-
width: '68vw'
50+
textOverflow: 'ellipsis'
5751
}
5852
}
5953
});

src/custom/Panel/style.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ListItemProps } from '@mui/material';
22
import { Box, IconButton, ListItem } from '../../base';
33
import { PanelDragHandleIcon } from '../../icons/PanelDragHandle';
4-
import { black, styled } from '../../theme';
4+
import { styled } from '../../theme';
55
import { PanelProps } from './Panel';
66

77
export const ListHeader = styled(ListItem)(({ theme }) => ({
@@ -86,10 +86,10 @@ export const PanelContainer = styled(Box)<{ intitialPosition: PanelProps['intiti
8686
borderRadius: '8px',
8787
overflow: 'hidden',
8888
flexShrink: 0,
89-
zIndex: 99999,
89+
zIndex: 100,
9090
position: 'absolute',
9191
backgroundColor: theme.palette.background.blur?.light,
92-
boxShadow: `0 4px 16px ${black}`,
92+
boxShadow: `0 4px 16px ${theme.palette.background.blur?.light}`,
9393
maxHeight: '80%',
9494
display: 'flex',
9595
boxSizing: 'border-box',

src/custom/ResponsiveDataTable.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,15 @@ const dataTableTheme = (theme: Theme, backgroundColor?: string) =>
166166
}
167167
}
168168
},
169+
MuiTableSortLabel: {
170+
styleOverrides: {
171+
root: {
172+
'&.Mui-active .MuiTableSortLabel-icon': {
173+
color: theme.palette.icon.default
174+
}
175+
}
176+
}
177+
},
169178
MUIDataTableHeadCell: {
170179
styleOverrides: {
171180
data: {

src/custom/TransferModal/TransferList/TransferList.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import { Checkbox, Grid, List, ListItem, Typography } from '../../../base';
33
import { KubernetesIcon, LeftArrowIcon, RightArrowIcon, SMPIcon } from '../../../icons';
4+
import { GithubIcon } from '../../../icons/Github';
45
import { MesheryIcon } from '../../../icons/Meshery';
56
import Tooltip from '../../../patches/Tooltip';
67
import {
@@ -22,7 +23,8 @@ export function getFallbackImageBasedOnKind(kind: string | undefined): JSX.Eleme
2223
}
2324
const fallbackComponents: { [key: string]: JSX.Element } = {
2425
meshery: <MesheryIcon />,
25-
kubernetes: <KubernetesIcon />
26+
kubernetes: <KubernetesIcon />,
27+
github: <GithubIcon />
2628
};
2729

2830
return fallbackComponents[kind] || null;

src/theme/components/cssbaseline.modifier.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ export const MuiCssBaseline: Components<Theme>['MuiCssBaseline'] = {
77
font-style: normal;
88
font-display: swap;
99
font-weight: 400;
10-
src:
10+
src:
1111
local('QanelasSoftRegular'),
12-
local('Quanelas Soft Regular'),
13-
url('/assets/fonts/QanelasSoftRegular.woff2') format('woff2');
12+
local('Quanelas Soft Regular')
1413
}
1514
`
1615
};

src/theme/typography.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export const typography = (mode: PaletteMode): TypographyOptions => {
8686
}
8787
},
8888
textB1Regular: {
89-
fontFamily: ['"Open Sans"', 'sans-serif'].join(','),
89+
fontFamily: ['Qanelas Soft Regular', 'Open Sans', 'sans-serif'].join(','),
9090
color: mode === 'light' ? common.black : common.white,
9191
fontSize: '1rem',
9292
fontWeight: 400,

0 commit comments

Comments
 (0)