Skip to content
Snippets Groups Projects
Commit aa5ffaf9 authored by Chris Beer's avatar Chris Beer
Browse files

Adjust typography to make all menu options body1

parent 60a1a569
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ export class LanguageSettings extends Component { ...@@ -34,7 +34,7 @@ export class LanguageSettings extends Component {
&& <ListItemIcon><CheckIcon /></ListItemIcon> && <ListItemIcon><CheckIcon /></ListItemIcon>
} }
<ListItemText inset> <ListItemText inset>
<Typography variant="inherit"> <Typography variant="body1">
{language.label} {language.label}
</Typography> </Typography>
</ListItemText> </ListItemText>
......
...@@ -53,7 +53,7 @@ export class NestedMenu extends Component { ...@@ -53,7 +53,7 @@ export class NestedMenu extends Component {
} }
{/* ListItemText adds left padding and we want this to line-up with menu items */} {/* ListItemText adds left padding and we want this to line-up with menu items */}
<ListItemText style={{ paddingLeft: 0 }}> <ListItemText style={{ paddingLeft: 0 }}>
<Typography varient="inherit">{label}</Typography> <Typography variant="body1">{label}</Typography>
</ListItemText> </ListItemText>
{ {
nestedMenuIsOpen nestedMenuIsOpen
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import Menu from '@material-ui/core/Menu'; import Menu from '@material-ui/core/Menu';
import MenuItem from '@material-ui/core/MenuItem'; import MenuItem from '@material-ui/core/MenuItem';
import Typography from '@material-ui/core/Typography';
import ListSubheader from '@material-ui/core/ListSubheader'; import ListSubheader from '@material-ui/core/ListSubheader';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ns from '../config/css-ns'; import ns from '../config/css-ns';
...@@ -49,9 +50,11 @@ export class WindowList extends Component { ...@@ -49,9 +50,11 @@ export class WindowList extends Component {
selected={i === 0} selected={i === 0}
onClick={(e) => { focusWindow(window.id); handleClose(e); }} onClick={(e) => { focusWindow(window.id); handleClose(e); }}
> >
<Typography variant="body1">
{ {
this.titleContent(window) this.titleContent(window)
} }
</Typography>
</MenuItem> </MenuItem>
)) ))
} }
......
...@@ -110,14 +110,14 @@ export class WorkspaceMenu extends Component { ...@@ -110,14 +110,14 @@ export class WorkspaceMenu extends Component {
onClick={(e) => { this.handleMenuItemClick('windowList', e); handleClose(e); }} onClick={(e) => { this.handleMenuItemClick('windowList', e); handleClose(e); }}
aria-owns={windowList.anchorEl ? 'window-list-menu' : undefined} aria-owns={windowList.anchorEl ? 'window-list-menu' : undefined}
> >
<Typography varient="inherit">{t('listAllOpenWindows')}</Typography> <Typography variant="body1">{t('listAllOpenWindows')}</Typography>
</MenuItem> </MenuItem>
<MenuItem <MenuItem
aria-haspopup="true" aria-haspopup="true"
onClick={(e) => { this.handleZoomToggleClick(e); handleClose(e); }} onClick={(e) => { this.handleZoomToggleClick(e); handleClose(e); }}
aria-owns={toggleZoom.anchorEl ? 'toggle-zoom-menu' : undefined} aria-owns={toggleZoom.anchorEl ? 'toggle-zoom-menu' : undefined}
> >
<Typography varient="inherit"> <Typography variant="body1">
{ showZoomControls ? t('hideZoomControls') : t('showZoomControls') } { showZoomControls ? t('hideZoomControls') : t('showZoomControls') }
</Typography> </Typography>
</MenuItem> </MenuItem>
...@@ -126,7 +126,7 @@ export class WorkspaceMenu extends Component { ...@@ -126,7 +126,7 @@ export class WorkspaceMenu extends Component {
onClick={(e) => { this.handleMenuItemClick('workspaceSelection', e); handleClose(e); }} onClick={(e) => { this.handleMenuItemClick('workspaceSelection', e); handleClose(e); }}
aria-owns={workspaceSelection.anchorEl ? 'workspace-selection' : undefined} aria-owns={workspaceSelection.anchorEl ? 'workspace-selection' : undefined}
> >
<Typography varient="inherit">{t('selectWorkspaceMenu')}</Typography> <Typography variant="body1">{t('selectWorkspaceMenu')}</Typography>
</MenuItem> </MenuItem>
<NestedMenu label={t('language')} divider> <NestedMenu label={t('language')} divider>
...@@ -141,7 +141,7 @@ export class WorkspaceMenu extends Component { ...@@ -141,7 +141,7 @@ export class WorkspaceMenu extends Component {
<ListItemIcon> <ListItemIcon>
<SettingsIcon /> <SettingsIcon />
</ListItemIcon> </ListItemIcon>
<Typography varient="inherit">{t('settings')}</Typography> <Typography variant="body1">{t('settings')}</Typography>
</MenuItem> </MenuItem>
<MenuItem <MenuItem
aria-haspopup="true" aria-haspopup="true"
...@@ -151,7 +151,7 @@ export class WorkspaceMenu extends Component { ...@@ -151,7 +151,7 @@ export class WorkspaceMenu extends Component {
<ListItemIcon> <ListItemIcon>
<SaveAltIcon /> <SaveAltIcon />
</ListItemIcon> </ListItemIcon>
<Typography varient="inherit">{t('downloadExportWorkspace')}</Typography> <Typography variant="body1">{t('downloadExportWorkspace')}</Typography>
</MenuItem> </MenuItem>
</Menu> </Menu>
<WindowList <WindowList
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment