Fixed theme related issues after react porting.

This commit is contained in:
Nikhil Mohite 2021-10-04 18:00:09 +05:30 committed by Akshay Joshi
parent 17ad46fe9d
commit 40b8da8223
6 changed files with 45 additions and 5 deletions

View File

@ -85,6 +85,11 @@ export default function(basicSettings) {
headerBg: '#424242', headerBg: '#424242',
activeColor: '#d4d4d4', activeColor: '#d4d4d4',
tableBg: '#424242', tableBg: '#424242',
activeStepBg: '#234d6e',
activeStepFg: '#FFFFFF',
stepBg: '#FFFFFF',
stepFg: '#000',
toggleBtnBg: '#000'
} }
}); });
} }

View File

@ -57,7 +57,7 @@ export default function(basicSettings) {
}, },
text: { text: {
primary: '#fff', primary: '#fff',
muted: '#8b9cad', muted: '#8b9cac',
}, },
background: { background: {
paper: '#010B15', paper: '#010B15',
@ -83,6 +83,11 @@ export default function(basicSettings) {
headerBg: '#010B15', headerBg: '#010B15',
activeColor: '#d4d4d4', activeColor: '#d4d4d4',
tableBg: '#010B15', tableBg: '#010B15',
activeStepBg: '#84D6FF',
activeStepFg: '#010b15',
stepBg: '#FFFFFF',
stepFg: '#000',
toggleBtnBg: '#6B6B6B'
} }
}); });
} }

View File

@ -242,6 +242,13 @@ function getFinalTheme(baseTheme) {
borderColor: baseTheme.otherVars.inputBorderColor, borderColor: baseTheme.otherVars.inputBorderColor,
} }
}, },
MuiFormControlLabel: {
label: {
'&.Mui-disabled': {
color: baseTheme.palette.text.muted
}
}
},
MuiTabs: { MuiTabs: {
root: { root: {
backgroundColor: baseTheme.otherVars.headerBg, backgroundColor: baseTheme.otherVars.headerBg,
@ -306,6 +313,13 @@ function getFinalTheme(baseTheme) {
backgroundColor: baseTheme.otherVars.headerBg, backgroundColor: baseTheme.otherVars.headerBg,
} }
}, },
MuiToggleButtonGroup: {
groupedHorizontal : {
'&:not(:first-child)': {
borderLeft: 'abc'
}
}
},
MuiSwitch: { MuiSwitch: {
root: { root: {
width: 54, width: 54,
@ -341,13 +355,23 @@ function getFinalTheme(baseTheme) {
}, },
thumb: { thumb: {
border: '1px solid ' + baseTheme.otherVars.inputBorderColor border: '1px solid ' + baseTheme.otherVars.inputBorderColor
},
track: {
backgroundColor: baseTheme.otherVars.toggleBtnBg
} }
}, },
MuiCheckbox: { MuiCheckbox: {
root: { root: {
padding: '0px', padding: '0px',
color: baseTheme.otherVars.inputBorderColor, color: baseTheme.otherVars.inputBorderColor,
},
colorPrimary: {
'&.Mui-disabled': {
color: baseTheme.palette.text.muted
}
} }
}, },
MuiToggleButton: { MuiToggleButton: {
root: { root: {

View File

@ -91,6 +91,11 @@ export default function(basicSettings) {
headerBg: '#fff', headerBg: '#fff',
activeColor: '#326690', activeColor: '#326690',
tableBg: '#fff', tableBg: '#fff',
activeStepBg: '#326690',
activeStepFg: '#FFFFFF',
stepBg: '#ddd',
stepFg: '#000',
toggleBtnBg: '#000'
} }
}); });
} }

View File

@ -56,14 +56,15 @@ const useStyles = makeStyles((theme) =>
fontWeight: 600 fontWeight: 600
}, },
activeIndex: { activeIndex: {
backgroundColor: '#326690 !important', backgroundColor: theme.otherVars.activeStepBg + ' !important',
color: '#fff' color: theme.otherVars.activeStepFg + ' !important'
}, },
stepIndex: { stepIndex: {
padding: '0.5em 1em ', padding: '0.5em 1em ',
height: '2.5em', height: '2.5em',
borderRadius: '2em', borderRadius: '2em',
backgroundColor: '#ddd', backgroundColor: theme.otherVars.stepBg,
color: theme.otherVars.stepFg,
display: 'inline-block', display: 'inline-block',
flex: 0.5, flex: 0.5,

View File

@ -7,7 +7,7 @@
.CodeMirror { .CodeMirror {
font-size: 1em; font-size: 1em;
font-family: monospace, monospace; font-family: monospace, monospace;
background-color: $color-editor-bg; background-color: $color-editor-bg !important;
color: $color-editor-fg; color: $color-editor-fg;
} }