mirror of
				https://github.com/Unleash/unleash.git
				synced 2025-10-27 11:02:16 +01:00 
			
		
		
		
	refactor: unify header icons (#897)
* refactor: unify header icon colors * refactor: add a chevron for the settings menu
This commit is contained in:
		
							parent
							
								
									96d2c924b4
								
							
						
					
					
						commit
						03e04e7c31
					
				@ -13,7 +13,7 @@ export const useStyles = makeStyles(theme => ({
 | 
				
			|||||||
        display: 'flex',
 | 
					        display: 'flex',
 | 
				
			||||||
        justifyContent: 'center',
 | 
					        justifyContent: 'center',
 | 
				
			||||||
        marginLeft: '1.5rem',
 | 
					        marginLeft: '1.5rem',
 | 
				
			||||||
        ['& a']: {
 | 
					        '& a': {
 | 
				
			||||||
            textDecoration: 'none',
 | 
					            textDecoration: 'none',
 | 
				
			||||||
            color: 'inherit',
 | 
					            color: 'inherit',
 | 
				
			||||||
            marginRight: '1.5rem',
 | 
					            marginRight: '1.5rem',
 | 
				
			||||||
@ -81,4 +81,10 @@ export const useStyles = makeStyles(theme => ({
 | 
				
			|||||||
        display: 'flex',
 | 
					        display: 'flex',
 | 
				
			||||||
        color: '#000',
 | 
					        color: '#000',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    icon: {
 | 
				
			||||||
 | 
					        color: theme.palette.grey[600],
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    wideButton: {
 | 
				
			||||||
 | 
					        borderRadius: 100,
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
}));
 | 
					}));
 | 
				
			||||||
 | 
				
			|||||||
@ -109,7 +109,7 @@ const Header = () => {
 | 
				
			|||||||
                            onClick={e => setAnchorElAdvanced(e.currentTarget)}
 | 
					                            onClick={e => setAnchorElAdvanced(e.currentTarget)}
 | 
				
			||||||
                        >
 | 
					                        >
 | 
				
			||||||
                            Configure
 | 
					                            Configure
 | 
				
			||||||
                            <KeyboardArrowDown />
 | 
					                            <KeyboardArrowDown className={styles.icon} />
 | 
				
			||||||
                        </button>
 | 
					                        </button>
 | 
				
			||||||
                        <NavigationMenu
 | 
					                        <NavigationMenu
 | 
				
			||||||
                            id="settings-navigation"
 | 
					                            id="settings-navigation"
 | 
				
			||||||
@ -126,7 +126,7 @@ const Header = () => {
 | 
				
			|||||||
                                target="_blank"
 | 
					                                target="_blank"
 | 
				
			||||||
                                rel="noopener noreferrer"
 | 
					                                rel="noopener noreferrer"
 | 
				
			||||||
                            >
 | 
					                            >
 | 
				
			||||||
                                <MenuBookIcon />
 | 
					                                <MenuBookIcon className={styles.icon} />
 | 
				
			||||||
                            </IconButton>
 | 
					                            </IconButton>
 | 
				
			||||||
                        </Tooltip>
 | 
					                        </Tooltip>
 | 
				
			||||||
                        <ConditionallyRender
 | 
					                        <ConditionallyRender
 | 
				
			||||||
@ -137,8 +137,12 @@ const Header = () => {
 | 
				
			|||||||
                                        onClick={e =>
 | 
					                                        onClick={e =>
 | 
				
			||||||
                                            setAnchorEl(e.currentTarget)
 | 
					                                            setAnchorEl(e.currentTarget)
 | 
				
			||||||
                                        }
 | 
					                                        }
 | 
				
			||||||
 | 
					                                        className={styles.wideButton}
 | 
				
			||||||
                                    >
 | 
					                                    >
 | 
				
			||||||
                                        <SettingsIcon />
 | 
					                                        <SettingsIcon />
 | 
				
			||||||
 | 
					                                        <KeyboardArrowDown
 | 
				
			||||||
 | 
					                                            className={styles.icon}
 | 
				
			||||||
 | 
					                                        />
 | 
				
			||||||
                                    </IconButton>
 | 
					                                    </IconButton>
 | 
				
			||||||
                                </Tooltip>
 | 
					                                </Tooltip>
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
import { makeStyles } from '@material-ui/core/styles';
 | 
					import { makeStyles } from '@material-ui/core/styles';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export const useStyles = makeStyles({
 | 
					export const useStyles = makeStyles(theme => ({
 | 
				
			||||||
    userProfileMenu: {
 | 
					    userProfileMenu: {
 | 
				
			||||||
        display: 'flex',
 | 
					        display: 'flex',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
@ -11,4 +11,7 @@ export const useStyles = makeStyles({
 | 
				
			|||||||
        color: 'inherit',
 | 
					        color: 'inherit',
 | 
				
			||||||
        padding: '0.2rem 1rem',
 | 
					        padding: '0.2rem 1rem',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
});
 | 
					    icon: {
 | 
				
			||||||
 | 
					        color: theme.palette.grey[600],
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					}));
 | 
				
			||||||
 | 
				
			|||||||
@ -74,7 +74,7 @@ const UserProfile = ({
 | 
				
			|||||||
                        src={imageUrl}
 | 
					                        src={imageUrl}
 | 
				
			||||||
                        data-testid={HEADER_USER_AVATAR}
 | 
					                        data-testid={HEADER_USER_AVATAR}
 | 
				
			||||||
                    />
 | 
					                    />
 | 
				
			||||||
                    <KeyboardArrowDownIcon />
 | 
					                    <KeyboardArrowDownIcon className={styles.icon} />
 | 
				
			||||||
                </Button>
 | 
					                </Button>
 | 
				
			||||||
                <UserProfileContent
 | 
					                <UserProfileContent
 | 
				
			||||||
                    showProfile={showProfile}
 | 
					                    showProfile={showProfile}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user