Merge pull request #609 from ente-io/use-stroke-color-icons

Use stroke color icons
This commit is contained in:
Abhinav Kumar 2022-06-22 11:10:17 +05:30 committed by GitHub
commit bfb7447093
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 4 deletions

View file

@ -21,7 +21,8 @@ const ShowHidePassword = ({
aria-label="toggle password visibility" aria-label="toggle password visibility"
onClick={handleClickShowPassword} onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword} onMouseDown={handleMouseDownPassword}
edge="end"> edge="end"
sx={{ color: 'stroke.secondary' }}>
{showPassword ? <VisibilityOffIcon /> : <VisibilityIcon />} {showPassword ? <VisibilityOffIcon /> : <VisibilityIcon />}
</IconButton> </IconButton>
</InputAdornment> </InputAdornment>

View file

@ -36,7 +36,7 @@ export const ValueContainerWithIcon: SelectComponents<
>['ValueContainer'] = (props) => ( >['ValueContainer'] = (props) => (
<ValueContainer {...props}> <ValueContainer {...props}>
<FlexWrapper> <FlexWrapper>
<Box className="icon" mr={'12px'} color="rgba(255, 255, 255, 0.24)"> <Box className="icon" mr={'12px'} color="stroke.secondary">
{getIconByType(props.getValue()[0]?.type)} {getIconByType(props.getValue()[0]?.type)}
</Box> </Box>
{props.children} {props.children}

View file

@ -12,7 +12,10 @@ export default function HeaderSection({ closeSidebar }: IProps) {
return ( return (
<SpaceBetweenFlex> <SpaceBetweenFlex>
<EnteLogo /> <EnteLogo />
<IconButton aria-label="close" onClick={closeSidebar}> <IconButton
aria-label="close"
onClick={closeSidebar}
sx={{ color: 'stroke.secondary' }}>
<CloseIcon fontSize="small" /> <CloseIcon fontSize="small" />
</IconButton> </IconButton>
</SpaceBetweenFlex> </SpaceBetweenFlex>

View file

@ -12,7 +12,6 @@ export const SelectStyles = {
':hover': { ':hover': {
borderColor: '#1dba54', borderColor: '#1dba54',
cursor: 'text', cursor: 'text',
'&>.icon': { color: '#1dba54' },
}, },
}), }),
input: (style) => ({ input: (style) => ({

View file

@ -2,16 +2,19 @@ import {
createTheme, createTheme,
PaletteColor, PaletteColor,
PaletteColorOptions, PaletteColorOptions,
TypeText,
} from '@mui/material/styles'; } from '@mui/material/styles';
declare module '@mui/material/styles' { declare module '@mui/material/styles' {
interface Palette { interface Palette {
accent: PaletteColor; accent: PaletteColor;
danger: PaletteColor; danger: PaletteColor;
stroke: TypeText;
} }
interface PaletteOptions { interface PaletteOptions {
accent?: PaletteColorOptions; accent?: PaletteColorOptions;
danger?: PaletteColorOptions; danger?: PaletteColorOptions;
stroke?: Partial<TypeText>;
} }
interface TypographyVariants { interface TypographyVariants {
@ -110,6 +113,13 @@ const darkThemeOptions = createTheme({
variant: 'filled', variant: 'filled',
margin: 'dense', margin: 'dense',
}, },
styleOverrides: {
root: {
'& .MuiInputAdornment-root': {
marginRight: '8px',
},
},
},
}, },
}, },
@ -131,6 +141,11 @@ const darkThemeOptions = createTheme({
danger: { danger: {
main: '#c93f3f', main: '#c93f3f',
}, },
stroke: {
primary: '#ffffff',
secondary: 'rgba(256,256,256,0.24)',
disabled: 'rgba(256,256,256,0.12)',
},
background: { default: '#000000', paper: '#1b1b1b' }, background: { default: '#000000', paper: '#1b1b1b' },
grey: { grey: {
A100: '#ccc', A100: '#ccc',