Merge branch 'dev' into 'staging'
new theme color own See merge request frontend/squzanswerer!179
This commit is contained in:
commit
df13ed5609
@ -52,7 +52,7 @@ const OwnInput = ({ questionId, variant, largeCheck, ownPlaceholder }: OwnInputP
|
|||||||
resize: "none",
|
resize: "none",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
fontSize: "16px",
|
fontSize: "16px",
|
||||||
color: theme.palette.text.primary,
|
color: ownAnswer.length === 0 ? theme.palette.ownPlaceholder.main : theme.palette.text.primary,
|
||||||
letterSpacing: "-0.4px",
|
letterSpacing: "-0.4px",
|
||||||
wordSpacing: "-3px",
|
wordSpacing: "-3px",
|
||||||
outline: "0px none",
|
outline: "0px none",
|
||||||
|
@ -41,7 +41,7 @@ const OwnInput = ({ questionId, variant, largeCheck, ownPlaceholder }: OwnInputP
|
|||||||
resize: "none",
|
resize: "none",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
fontSize: "16px",
|
fontSize: "16px",
|
||||||
color: theme.palette.text.primary,
|
color: ownAnswer.length === 0 ? theme.palette.ownPlaceholder.main : theme.palette.text.primary,
|
||||||
letterSpacing: "-0.4px",
|
letterSpacing: "-0.4px",
|
||||||
wordSpacing: "-3px",
|
wordSpacing: "-3px",
|
||||||
outline: "0px none",
|
outline: "0px none",
|
||||||
|
@ -40,7 +40,7 @@ const OwnInput = ({ questionId, variant, largeCheck, ownPlaceholder }: OwnInputP
|
|||||||
resize: "none",
|
resize: "none",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
fontSize: "16px",
|
fontSize: "16px",
|
||||||
color: theme.palette.text.primary,
|
color: ownAnswer.length === 0 ? theme.palette.ownPlaceholder.main : theme.palette.text.primary,
|
||||||
letterSpacing: "-0.4px",
|
letterSpacing: "-0.4px",
|
||||||
wordSpacing: "-3px",
|
wordSpacing: "-3px",
|
||||||
outline: "0px none",
|
outline: "0px none",
|
||||||
|
@ -50,7 +50,7 @@ const OwnInput = ({ questionId, variant, largeCheck, ownPlaceholder }: OwnInputP
|
|||||||
resize: "none",
|
resize: "none",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
fontSize: "16px",
|
fontSize: "16px",
|
||||||
color: theme.palette.text.primary,
|
color: ownAnswer.length === 0 ? theme.palette.ownPlaceholder.main : theme.palette.text.primary,
|
||||||
letterSpacing: "-0.4px",
|
letterSpacing: "-0.4px",
|
||||||
wordSpacing: "-3px",
|
wordSpacing: "-3px",
|
||||||
outline: "0px none",
|
outline: "0px none",
|
||||||
|
@ -42,6 +42,9 @@ const darkTheme = createTheme({
|
|||||||
navbarbg: {
|
navbarbg: {
|
||||||
main: "#333647",
|
main: "#333647",
|
||||||
},
|
},
|
||||||
|
ownPlaceholder: {
|
||||||
|
main: "#333647",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -46,6 +46,9 @@ const lightTheme = createTheme({
|
|||||||
orange: {
|
orange: {
|
||||||
main: "#FB5607",
|
main: "#FB5607",
|
||||||
},
|
},
|
||||||
|
ownPlaceholder: {
|
||||||
|
main: "#FFFFFF",
|
||||||
|
},
|
||||||
navbarbg: {
|
navbarbg: {
|
||||||
main: "#FFFFFF",
|
main: "#FFFFFF",
|
||||||
},
|
},
|
||||||
|
2
lib/utils/themes/mui.d.ts
vendored
2
lib/utils/themes/mui.d.ts
vendored
@ -12,6 +12,7 @@ declare module "@mui/material/styles" {
|
|||||||
grey4: Palette["primary"];
|
grey4: Palette["primary"];
|
||||||
orange: Palette["primary"];
|
orange: Palette["primary"];
|
||||||
navbarbg: Palette["primary"];
|
navbarbg: Palette["primary"];
|
||||||
|
ownPlaceholder: Palette["primary"];
|
||||||
}
|
}
|
||||||
interface PaletteOptions {
|
interface PaletteOptions {
|
||||||
lightPurple?: PaletteOptions["primary"];
|
lightPurple?: PaletteOptions["primary"];
|
||||||
@ -24,6 +25,7 @@ declare module "@mui/material/styles" {
|
|||||||
grey4?: PaletteOptions["primary"];
|
grey4?: PaletteOptions["primary"];
|
||||||
orange?: PaletteOptions["primary"];
|
orange?: PaletteOptions["primary"];
|
||||||
navbarbg?: PaletteOptions["primary"];
|
navbarbg?: PaletteOptions["primary"];
|
||||||
|
ownPlaceholder?: PaletteOptions["primary"];
|
||||||
}
|
}
|
||||||
interface TypographyVariants {
|
interface TypographyVariants {
|
||||||
infographic: React.CSSProperties;
|
infographic: React.CSSProperties;
|
||||||
|
Loading…
Reference in New Issue
Block a user