-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #45 from reedoooo/clean/styledAndCustomComponents
simpliofying
- Loading branch information
Showing
103 changed files
with
1,406 additions
and
1,501 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import { | ||
| boxShadow, | ||
| hexToRgba, | ||
| hexToRgb, | ||
| linearGradient, | ||
| pxToRem, | ||
| rgba, | ||
| } from './themes'; | ||
| import { | ||
| breakpoints, | ||
| colors, | ||
| borders, | ||
| boxShadows, | ||
| typography, | ||
| palette, | ||
| } from './themes'; | ||
| import { Transitions } from './themes'; | ||
| import components from './themes/components'; | ||
|
|
||
| export const themeSettings = (mode) => { | ||
| return { | ||
| functions: { | ||
| boxShadow, | ||
| hexToRgb, | ||
| hexToRgba, | ||
| linearGradient, | ||
| pxToRem, | ||
| rgba, | ||
| }, | ||
| palette: { | ||
| ...colors, | ||
| mode: mode, | ||
| }, | ||
| newPalette: { | ||
| ...palette, | ||
| mode: mode, | ||
| }, | ||
| components: { | ||
| ...components, | ||
| }, | ||
| breakpoints: breakpoints.values, | ||
| Transitions: Transitions, | ||
| borders: borders, | ||
| boxShadows: boxShadows, | ||
| typography: typography, | ||
| spacing: (factor) => `${0.25 * factor}rem`, | ||
| zIndex: { | ||
| appBar: 1200, | ||
| drawer: 1100, | ||
| }, | ||
| // components: { | ||
| // MuiCssBaseline: components.MuiCssBaseline, | ||
| // MuiDivider: components.MuiDivider, | ||
| // MuiTableContainer: components.MuiTableContainer, | ||
| // MuiTableCell: components.MuiTableCell, | ||
| // MuiTableHead: components.MuiTableHead, | ||
| // MuiButton: components.MuiButton, | ||
| // MuiInput: components.MuiInput, | ||
| // MuiInputLabel: components.MuiInputLabel, | ||
| // MuiSlider: components.MuiSlider, | ||
| // MuiSwitch: components.MuiSwitch, | ||
| // MuiCard: components.MuiCard, | ||
| // MuiCardMedia: components.MuiCardMedia, | ||
| // MuiCardContent: components.MuiCardContent, | ||
| // MuiTabs: components.MuiTabs, | ||
| // MuiTab: components.MuiTab, | ||
| // }, | ||
| }; | ||
| }; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // import { GlobalStyles } from '@mui/material'; | ||
|
|
||
| // const MyGlobalStyles = () => ( | ||
| // <GlobalStyles | ||
| // styles={{ | ||
| // html: { | ||
| // height: '100%', | ||
| // fontSize: '16px', // default font-size | ||
| // maxWidth: '100vw', | ||
| // fontFamily: '"Roboto", sans-serif', // default font | ||
| // color: '#333', // default text color | ||
| // }, | ||
| // body: { | ||
| // backgroundColor: '#f4f4f4', // a light grey background | ||
| // margin: '0', // remove default margin | ||
| // padding: '0', // remove default padding | ||
| // maxWidth: '100vw', | ||
| // boxSizing: 'border-box', // box model handling | ||
| // }, | ||
| // '*': { | ||
| // boxSizing: 'inherit', // every element to inherit boxSizing | ||
| // }, | ||
| // a: { | ||
| // textDecoration: 'none', // remove underline from all links | ||
| // color: 'inherit', // links will inherit their parent color | ||
| // }, | ||
| // '*::-webkit-scrollbar-track': { | ||
| // backgroundColor: 'gray.200', | ||
| // }, | ||
| // '*::-webkit-scrollbar-thumb': { | ||
| // backgroundColor: 'gray.500', | ||
| // borderRadius: '20px', | ||
| // }, | ||
| // }} | ||
| // /> | ||
| // ); | ||
|
|
||
| // export default MyGlobalStyles; |
Oops, something went wrong.