Skip to content

Commit 222cd47

Browse files
authored
Merge pull request #391 from jeradrutnam/next
Improve default styling of oxygen-ui
2 parents dcd2330 + 4774939 commit 222cd47

File tree

1 file changed

+31
-8
lines changed

1 file changed

+31
-8
lines changed

packages/oxygen-ui/src/styles/OxygenTheme/OxygenTheme.ts

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const OxygenTheme = createTheme({
7979
primary: '#efefef',
8080
secondary: '#D0D3E2',
8181
},
82-
divider: '#fefefe12',
82+
divider: '#ffffff16',
8383
},
8484
},
8585
},
@@ -118,14 +118,17 @@ const OxygenTheme = createTheme({
118118
border: '1px solid #ffffff7a',
119119
background: 'rgb(230 230 230 / 5%)',
120120
boxShadow:
121-
'0 5px 10px 0 rgba(6, 6, 14, 0.1), ' +
122-
'0 0 0 0 rgba(199, 211, 234, 0.01) inset, ' +
123-
'0 0 0 0 rgba(199, 211, 234, 0.12) inset',
121+
'0 10px 22px 0 rgba(6, 6, 14, 0.1),' +
122+
'0 24px 48px 0 rgba(199, 211, 234, 0.05) inset,' +
123+
'0 1px 1px 0 rgba(199, 211, 234, 0.12) inset',
124124
}),
125125
...theme.applyStyles('dark', {
126126
border: '1px solid #d2d2d20f',
127127
background: 'rgb(230 230 230 / 5%)',
128-
boxShadow: 'hsla(220, 30%, 5%, 0.5) 0px 5px 15px 0px, hsla(220, 25%, 10%, 0.08) 0px 15px 35px -5px',
128+
boxShadow:
129+
'0 24px 32px 0 rgba(6, 6, 14, 0.70),' +
130+
'0 24px 48px 0 rgba(199, 211, 234, 0.05) inset,' +
131+
'0 1px 1px 0 rgba(199, 211, 234, 0.12) inset',
129132
}),
130133
})
131134
}
@@ -145,6 +148,9 @@ const OxygenTheme = createTheme({
145148
MuiTextField: {
146149
defaultProps: { size: 'small' },
147150
},
151+
MuiSelect: {
152+
defaultProps: { size: 'small' },
153+
},
148154
MuiOutlinedInput: {
149155
styleOverrides: {
150156
root: ({ theme }) => ({
@@ -189,14 +195,31 @@ const OxygenTheme = createTheme({
189195
},
190196
MuiListItemButton: {
191197
styleOverrides: {
192-
root: { borderRadius: '8px' },
198+
root: ({ theme }) => ({
199+
borderRadius: '8px',
200+
'&.Mui-selected': {
201+
...theme.applyStyles('light', {
202+
backgroundColor: theme.palette.action.selected,
203+
}),
204+
...theme.applyStyles('dark', {
205+
backgroundColor: '#ffffff1a',
206+
}),
207+
'&:hover': {
208+
...theme.applyStyles('light', {
209+
backgroundColor: theme.palette.action.hover,
210+
}),
211+
...theme.applyStyles('dark', {
212+
backgroundColor: '#ffffff1a',
213+
}),
214+
},
215+
},
216+
}),
193217
},
194218
},
195219
MuiDataGrid: {
196220
styleOverrides: {
197221
root: ({ theme }) => ({
198-
border: '1px solid',
199-
borderColor: theme.palette.divider,
222+
border: 'none',
200223
backgroundColor: 'transparent',
201224
borderRadius: '8px',
202225
overflow: 'hidden',

0 commit comments

Comments
 (0)