Merge branch 'develop' into feat/fe/statuspage-3
This commit is contained in:
commit
083a134339
160 files changed
+1832
-2120
No files matched your search
@@ -44,7 +44,7 @@ const ImageField = ({ id, src, loading, onChange, error, isRound = true, maxSize
|
||||
borderRadius: theme.shape.borderRadius,
|
||||
borderColor: isDragging
|
||||
? theme.palette.primary.main
|
||||
: theme.palette.border.light,
|
||||
: theme.palette.primary.lowContrast,
|
||||
borderWidth: "2px",
|
||||
transition: "0.2s",
|
||||
"&:hover": {
|
||||
@@ -93,7 +93,7 @@ const ImageField = ({ id, src, loading, onChange, error, isRound = true, maxSize
|
||||
sx={{
|
||||
pointerEvents: "none",
|
||||
borderRadius: theme.shape.borderRadius,
|
||||
border: `solid ${theme.shape.borderThick}px ${theme.palette.border.light}`,
|
||||
border: `solid ${theme.shape.borderThick}px ${theme.palette.primary.lowContrast}`,
|
||||
boxShadow: theme.shape.boxShadow,
|
||||
}}
|
||||
>
|
||||
@@ -101,7 +101,7 @@ const ImageField = ({ id, src, loading, onChange, error, isRound = true, maxSize
|
||||
</IconButton>
|
||||
<Typography
|
||||
component="h2"
|
||||
color={theme.palette.text.tertiary}
|
||||
color={theme.palette.primary.contrastTextTertiary}
|
||||
>
|
||||
<Typography
|
||||
component="span"
|
||||
@@ -115,7 +115,7 @@ const ImageField = ({ id, src, loading, onChange, error, isRound = true, maxSize
|
||||
</Typography>
|
||||
<Typography
|
||||
component="p"
|
||||
color={theme.palette.text.tertiary}
|
||||
color={theme.palette.primary.contrastTextTertiary}
|
||||
sx={{ opacity: 0.6 }}
|
||||
>
|
||||
(maximum size: {maxSize??"3MB"})
|
||||
@@ -124,7 +124,7 @@ const ImageField = ({ id, src, loading, onChange, error, isRound = true, maxSize
|
||||
</Box>
|
||||
<Typography
|
||||
component="p"
|
||||
color={theme.palette.text.tertiary}
|
||||
color={theme.palette.primary.contrastTextTertiary}
|
||||
sx={{ opacity: 0.6 }}
|
||||
>
|
||||
Supported formats: JPG, PNG
|
||||
|
||||
Reference in new issue
Block a user