feat: fixing lots of colors
This commit is contained in:
1 parent
61aaa8489a
commit
541a5b3f12
33 files changed
+194
-331
No files matched your search
@@ -97,32 +97,18 @@ const newColors = {
|
||||
green200: "#4B9B77",
|
||||
green400: "#079455",
|
||||
green700: "#026513",
|
||||
orange100: "#CCB368",
|
||||
orange400: "#FD8F22",
|
||||
orange100: "#FD8F22",
|
||||
orange200: "#D69A5D",
|
||||
orange600: "#9B734B",
|
||||
orange700: "#884605" /* "#6F5404" */,
|
||||
/* warning: {
|
||||
main: {
|
||||
light: newColors.orange700,
|
||||
dark: newColors.orange100,
|
||||
},
|
||||
contrastText: {
|
||||
light: newColors.offWhite,
|
||||
dark: newColors.offBlack,
|
||||
},
|
||||
lowContrast: {
|
||||
light: newColors.orange400,
|
||||
dark: newColors.orange600,
|
||||
},
|
||||
}, */
|
||||
orange700: "#884605",
|
||||
red100: "#F27C7C",
|
||||
red400: "#D92020",
|
||||
red600: "#9B4B4B",
|
||||
red700: "#980303",
|
||||
};
|
||||
|
||||
/* Structure:
|
||||
Key:
|
||||
/*
|
||||
Structure:
|
||||
main: background color
|
||||
contrastText: color for main contrast text
|
||||
contrastTextSecondary: if needed
|
||||
@@ -200,14 +186,14 @@ const newSemanticColors = {
|
||||
warning: {
|
||||
main: {
|
||||
light: newColors.orange700,
|
||||
dark: newColors.orange100,
|
||||
dark: newColors.orange200,
|
||||
},
|
||||
contrastText: {
|
||||
light: newColors.offWhite,
|
||||
dark: newColors.offBlack,
|
||||
},
|
||||
lowContrast: {
|
||||
light: newColors.orange400,
|
||||
light: newColors.orange100,
|
||||
dark: newColors.orange600,
|
||||
},
|
||||
},
|
||||
@@ -248,33 +234,6 @@ const newSemanticColors = {
|
||||
dark: paletteColors.gray850,
|
||||
},
|
||||
},
|
||||
unresolved: {
|
||||
main: {
|
||||
light: paletteColors.blue700,
|
||||
dark: paletteColors.purple300,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export { typographyLevels, semanticColors as colors, newSemanticColors };
|
||||
|
||||
/* TODO
|
||||
|
||||
|
||||
|
||||
Look up for
|
||||
|
||||
success.contrastText
|
||||
warning.contrastText
|
||||
error.contrastText
|
||||
|
||||
|
||||
"red"
|
||||
"white"
|
||||
{ text, bg, border }
|
||||
.light
|
||||
.dark
|
||||
|
||||
|
||||
theme.palette.unresolved (will become tertiary)
|
||||
*/
|
||||
@@ -11,58 +11,3 @@ const darkTheme = createTheme({
|
||||
});
|
||||
|
||||
export default darkTheme;
|
||||
|
||||
// action: {
|
||||
// disabled: primary.lowContrast.disabled,
|
||||
// },
|
||||
// /* From this part on, try to create semantic structure, not feature based structure */
|
||||
// percentage: {
|
||||
// uptimePoor: error.main.dark,
|
||||
// uptimeFair: warning.contrastText.dark,
|
||||
// uptimeGood: warning.main.dark /* Change for a success color? ?*/,
|
||||
// uptimeExcellent: success.main.dark,
|
||||
// },
|
||||
// unresolved: {
|
||||
// main: unresolved.main.dark,
|
||||
// light: unresolved.light.dark,
|
||||
// bg: unresolved.bg.dark,
|
||||
// },
|
||||
// divider: border.light.dark,
|
||||
// other: {
|
||||
// icon: text.secondary.dark,
|
||||
// line: border.light.dark,
|
||||
// fill: background.accent.dark,
|
||||
// grid: other.grid.dark,
|
||||
// autofill: secondary.main.dark,
|
||||
// },
|
||||
// gradient: {
|
||||
// color1,
|
||||
// color2,
|
||||
// color3,
|
||||
// color4,
|
||||
// color5,
|
||||
// },
|
||||
// text: {
|
||||
// primary: text.primary.dark,
|
||||
// secondary: text.secondary.dark,
|
||||
// tertiary: text.tertiary.dark,
|
||||
// accent: text.accent.dark,
|
||||
// },
|
||||
// background: {
|
||||
// main: background.main.dark,
|
||||
// alt: background.alt.dark,
|
||||
// fill: background.fill.dark,
|
||||
// accent: background.accent.dark,
|
||||
// },
|
||||
// border: {
|
||||
// light: border.light.dark,
|
||||
// dark: primary.lowContrast.dark,
|
||||
// },
|
||||
// info: {
|
||||
// text: text.primary.dark,
|
||||
// main: text.secondary.dark,
|
||||
// bg: background.main.dark,
|
||||
// light: background.main.dark,
|
||||
// border: border.light.dark,
|
||||
// },
|
||||
// };
|
||||
@@ -32,9 +32,9 @@ const baseTheme = (palette) => ({
|
||||
fontWeight: 400,
|
||||
},
|
||||
},
|
||||
/* TODO we can skip using the callback functions on the next lines since we are already accessing it on line 10. That was the last thing I managed to do, so we are sort of doing it twice*/
|
||||
|
||||
/* TODO change to 4 */
|
||||
spacing: 2,
|
||||
/* TODO we can skip using the callback functions on the next lines since we are already accessing it on line 10. That was the last thing I managed to do, so we are sort of doing it twice*/
|
||||
/* TODO All these should live inside of a component*/
|
||||
components: {
|
||||
MuiButton: {
|
||||
|
||||
@@ -5,69 +5,9 @@ import { extractThemeColors } from "./extractColorObject";
|
||||
|
||||
const palette = extractThemeColors("light", newSemanticColors);
|
||||
|
||||
/* TODO I figured out we could have just one theme by passing mode as parameter for theme function. Implement later */
|
||||
const lightTheme = createTheme({
|
||||
palette,
|
||||
...baseTheme(palette),
|
||||
});
|
||||
|
||||
export default lightTheme;
|
||||
|
||||
/*
|
||||
TODO
|
||||
Next step: check if all keys here are being used in the codebase. e.g.: Search codebase for palette.primary; also check for destructuring palette ('= theme.palette')
|
||||
*/
|
||||
|
||||
// action: {
|
||||
// disabled: border.light.disabled,
|
||||
// },
|
||||
// percentage: {
|
||||
// uptimePoor: error.main.light,
|
||||
// uptimeFair: warning.contrastText.light,
|
||||
// uptimeGood: warning.main.light /* Change for a success color? */,
|
||||
// uptimeExcellent: success.main.light,
|
||||
// },
|
||||
// unresolved: {
|
||||
// main: unresolved.main.light,
|
||||
// light: unresolved.light.light,
|
||||
// bg: unresolved.bg.light,
|
||||
// },
|
||||
// divider: border.light.light,
|
||||
// other: {
|
||||
// icon: other.icon.light,
|
||||
// line: other.line.light,
|
||||
// fill: secondary.dark.light,
|
||||
// grid: other.grid.light,
|
||||
// autofill: other.autofill.light,
|
||||
// },
|
||||
// gradient: {
|
||||
// color1,
|
||||
// color2,
|
||||
// color3,
|
||||
// color4,
|
||||
// color5,
|
||||
// },
|
||||
// text: {
|
||||
// primary: text.primary.light,
|
||||
// secondary: text.secondary.light,
|
||||
// tertiary: text.tertiary.light,
|
||||
// accent: text.accent.light,
|
||||
// },
|
||||
// background: {
|
||||
// main: background.main.light,
|
||||
// alt: background.alt.light,
|
||||
// fill: background.fill.light,
|
||||
// accent: background.accent.light,
|
||||
// },
|
||||
// border: {
|
||||
// light: border.light.light,
|
||||
// dark: primary.lowContrast.light,
|
||||
// },
|
||||
// info: {
|
||||
// text: text.primary.light,
|
||||
// main: text.tertiary.light,
|
||||
// bg: background.main.light,
|
||||
// light: background.main.light,
|
||||
// border: primary.lowContrast.light,
|
||||
// },
|
||||
// };
|
||||
Reference in new issue
Block a user