From aa5ffaf930c1d2f628973aa235b7210581ec3eb0 Mon Sep 17 00:00:00 2001
From: Chris Beer <cabeer@stanford.edu>
Date: Wed, 13 Mar 2019 09:13:11 -0700
Subject: [PATCH] Adjust typography to make all menu options body1
---
src/components/LanguageSettings.js | 2 +-
src/components/NestedMenu.js | 2 +-
src/components/WindowList.js | 9 ++++++---
src/components/WorkspaceMenu.js | 10 +++++-----
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/components/LanguageSettings.js b/src/components/LanguageSettings.js
index 29efea8b7..b23ac7cf4 100644
--- a/src/components/LanguageSettings.js
+++ b/src/components/LanguageSettings.js
@@ -34,7 +34,7 @@ export class LanguageSettings extends Component {
&& <ListItemIcon><CheckIcon /></ListItemIcon>
}
<ListItemText inset>
- <Typography variant="inherit">
+ <Typography variant="body1">
{language.label}
</Typography>
</ListItemText>
diff --git a/src/components/NestedMenu.js b/src/components/NestedMenu.js
index 12ee88dcc..c178fa00b 100644
--- a/src/components/NestedMenu.js
+++ b/src/components/NestedMenu.js
@@ -53,7 +53,7 @@ export class NestedMenu extends Component {
}
{/* ListItemText adds left padding and we want this to line-up with menu items */}
<ListItemText style={{ paddingLeft: 0 }}>
- <Typography varient="inherit">{label}</Typography>
+ <Typography variant="body1">{label}</Typography>
</ListItemText>
{
nestedMenuIsOpen
diff --git a/src/components/WindowList.js b/src/components/WindowList.js
index 09dd0eb3b..d82c67f27 100644
--- a/src/components/WindowList.js
+++ b/src/components/WindowList.js
@@ -1,6 +1,7 @@
import React, { Component } from 'react';
import Menu from '@material-ui/core/Menu';
import MenuItem from '@material-ui/core/MenuItem';
+import Typography from '@material-ui/core/Typography';
import ListSubheader from '@material-ui/core/ListSubheader';
import PropTypes from 'prop-types';
import ns from '../config/css-ns';
@@ -49,9 +50,11 @@ export class WindowList extends Component {
selected={i === 0}
onClick={(e) => { focusWindow(window.id); handleClose(e); }}
>
- {
- this.titleContent(window)
- }
+ <Typography variant="body1">
+ {
+ this.titleContent(window)
+ }
+ </Typography>
</MenuItem>
))
}
diff --git a/src/components/WorkspaceMenu.js b/src/components/WorkspaceMenu.js
index 913dfa0a2..136341af7 100644
--- a/src/components/WorkspaceMenu.js
+++ b/src/components/WorkspaceMenu.js
@@ -110,14 +110,14 @@ export class WorkspaceMenu extends Component {
onClick={(e) => { this.handleMenuItemClick('windowList', e); handleClose(e); }}
aria-owns={windowList.anchorEl ? 'window-list-menu' : undefined}
>
- <Typography varient="inherit">{t('listAllOpenWindows')}</Typography>
+ <Typography variant="body1">{t('listAllOpenWindows')}</Typography>
</MenuItem>
<MenuItem
aria-haspopup="true"
onClick={(e) => { this.handleZoomToggleClick(e); handleClose(e); }}
aria-owns={toggleZoom.anchorEl ? 'toggle-zoom-menu' : undefined}
>
- <Typography varient="inherit">
+ <Typography variant="body1">
{ showZoomControls ? t('hideZoomControls') : t('showZoomControls') }
</Typography>
</MenuItem>
@@ -126,7 +126,7 @@ export class WorkspaceMenu extends Component {
onClick={(e) => { this.handleMenuItemClick('workspaceSelection', e); handleClose(e); }}
aria-owns={workspaceSelection.anchorEl ? 'workspace-selection' : undefined}
>
- <Typography varient="inherit">{t('selectWorkspaceMenu')}</Typography>
+ <Typography variant="body1">{t('selectWorkspaceMenu')}</Typography>
</MenuItem>
<NestedMenu label={t('language')} divider>
@@ -141,7 +141,7 @@ export class WorkspaceMenu extends Component {
<ListItemIcon>
<SettingsIcon />
</ListItemIcon>
- <Typography varient="inherit">{t('settings')}</Typography>
+ <Typography variant="body1">{t('settings')}</Typography>
</MenuItem>
<MenuItem
aria-haspopup="true"
@@ -151,7 +151,7 @@ export class WorkspaceMenu extends Component {
<ListItemIcon>
<SaveAltIcon />
</ListItemIcon>
- <Typography varient="inherit">{t('downloadExportWorkspace')}</Typography>
+ <Typography variant="body1">{t('downloadExportWorkspace')}</Typography>
</MenuItem>
</Menu>
<WindowList
--
GitLab