Skip to content

Commit

Permalink
#16 Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
vidhya-metacell committed Jul 26, 2022
2 parents bfeb598 + aece67f commit 806236f
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion dist/meta-diagram.cjs.development.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/meta-diagram.cjs.production.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/meta-diagram.esm.js.map

Large diffs are not rendered by default.

180 changes: 90 additions & 90 deletions dist/theme.d.ts
Original file line number Diff line number Diff line change
@@ -1,90 +1,90 @@
declare type ThemeVars = {
[key: string]: any;
};
declare const _default: (customVariables: ThemeVars) => {
components: {
MuiCssBaseline: {
styleOverrides: string;
};
MuiList: {
styleOverrides: {
root: {
'&.customSwitch': {
padding: string;
background: any;
borderRadius: string;
display: string;
'& .MuiListItemButton-root': {
padding: string;
borderRadius: string;
width: string;
display: string;
alignItems: string;
justifyContent: string;
'&:not(:last-child)': {
marginBottom: string;
};
'&.Mui-disabled': {
opacity: number;
};
'&.Mui-selected': {
background: any;
boxShadow: any;
border: string;
'& .MuiTypography-root': {
color: any;
};
};
};
'& .MuiChip-root': {
marginLeft: string;
};
'& .MuiTypography-root': {
fontWeight: number;
fontSize: string;
lineHeight: string;
letterSpacing: string;
color: any;
margin: number;
};
};
};
};
};
MuiListItemIcon: {
styleOverrides: {
root: {
minWidth: string;
};
};
};
MuiListItemButton: {
styleOverrides: {
root: {
padding: number;
width: string;
height: string;
borderRadius: string;
justifyContent: string;
backgroundColor: any;
'&:hover': {
backgroundColor: any;
};
'&:not(:last-child)': {
marginBottom: string;
};
'&.Mui-selected': {
backgroundColor: any;
'&:hover': {
backgroundColor: any;
};
};
'&.Mui-disabled': {
opacity: number;
};
};
};
};
};
};
export default _default;
declare type ThemeVars = {
[key: string]: any;
};
declare const _default: (customVariables: ThemeVars) => {
components: {
MuiCssBaseline: {
styleOverrides: string;
};
MuiList: {
styleOverrides: {
root: {
'&.customSwitch': {
padding: string;
background: any;
borderRadius: string;
display: string;
'& .MuiListItemButton-root': {
padding: string;
borderRadius: string;
width: string;
display: string;
alignItems: string;
justifyContent: string;
'&:not(:last-child)': {
marginBottom: string;
};
'&.Mui-disabled': {
opacity: number;
};
'&.Mui-selected': {
background: any;
boxShadow: any;
border: string;
'& .MuiTypography-root': {
color: any;
};
};
};
'& .MuiChip-root': {
marginLeft: string;
};
'& .MuiTypography-root': {
fontWeight: number;
fontSize: string;
lineHeight: string;
letterSpacing: string;
color: any;
margin: number;
};
};
};
};
};
MuiListItemIcon: {
styleOverrides: {
root: {
minWidth: string;
};
};
};
MuiListItemButton: {
styleOverrides: {
root: {
padding: number;
width: string;
height: string;
borderRadius: string;
justifyContent: string;
backgroundColor: any;
'&:hover': {
backgroundColor: any;
};
'&:not(:last-child)': {
marginBottom: string;
};
'&.Mui-selected': {
backgroundColor: any;
'&:hover': {
backgroundColor: any;
};
};
'&.Mui-disabled': {
opacity: number;
};
};
};
};
};
};
export default _default;

0 comments on commit 806236f

Please sign in to comment.