Skip to content

Commit 45ddb67

Browse files
authored
Merge pull request #945 from amitamrutiya/fix-styling-1
Fix panel styling and text field font family styling
2 parents 132b998 + d2e9fca commit 45ddb67

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

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/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)