Add required changes after rebasing

taskcluster · Oct 15, 2018 · 78ec190 · 78ec190
1 parent a378f7d
commit 78ec190
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/components/ClientForm/index.jsx b/src/components/ClientForm/index.jsx
@@ -248,7 +248,7 @@ export default class ClientForm extends Component {
             <ListItemText
               disableTypography
               primary={
-                <Typography component="h3" variant="subheading">
+                <Typography component="h3" variant="subtitle1">
                   Expires
                 </Typography>
               }

diff --git a/src/components/Dashboard/SidebarList.jsx b/src/components/Dashboard/SidebarList.jsx
@@ -88,7 +88,8 @@ export default class SidebarList extends Component {
           </SidebarListItem>
           <SidebarListItem
             to="/scopesets/expand"
-            icon={<ArrowExpandVerticalIcon />}>
+            icon={<ArrowExpandVerticalIcon />}
+          >
             Expand
           </SidebarListItem>
         </SidebarListGroup>

diff --git a/src/components/Dashboard/index.jsx b/src/components/Dashboard/index.jsx
@@ -247,7 +247,8 @@ export default class Dashboard extends Component {
               <Tooltip placement="bottom" title="Page Information">
                 <IconButton
                   onClick={this.handleHelpViewToggle}
-                  className={classes.appBarButton}>
+                  className={classes.appBarButton}
+                >
                   <HelpIcon className={classes.appIcon} />
                 </IconButton>
               </Tooltip>

diff --git a/src/views/ScopesetComparison/index.jsx b/src/views/ScopesetComparison/index.jsx
@@ -1,5 +1,5 @@
 import { hot } from 'react-hot-loader';
-import { Component, Fragment } from 'react';
+import React, { Component, Fragment } from 'react';
 import { withStyles } from '@material-ui/core/styles';
 import { equals } from 'ramda';
 import { scopeUnion, scopeIntersection } from 'taskcluster-lib-scopes';
@@ -104,7 +104,7 @@ export default class ScopesetComparison extends Component {
         <Fragment>
           <Grid className={classes.editorGrid} container spacing={8}>
             <Grid item xs={12} md={6}>
-              <Typography gutterBottom variant="subheading">
+              <Typography gutterBottom variant="subtitle1">
                 Scope A
               </Typography>
               <CodeEditor
@@ -116,7 +116,7 @@ export default class ScopesetComparison extends Component {
               />
             </Grid>
             <Grid item xs={12} md={6}>
-              <Typography gutterBottom variant="subheading">
+              <Typography gutterBottom variant="subtitle1">
                 Scope B
               </Typography>
               <CodeEditor
@@ -138,8 +138,9 @@ export default class ScopesetComparison extends Component {
                         scopes[0].map(scope => (
                           <Typography
                             key={scope}
-                            variant="body2"
-                            className={classes.cellGrid}>
+                            variant="body1"
+                            className={classes.cellGrid}
+                          >
                             {scope}
                           </Typography>
                         ))}
@@ -149,8 +150,9 @@ export default class ScopesetComparison extends Component {
                         scopes[1].map(scope => (
                           <Typography
                             key={scope}
-                            variant="body2"
-                            className={classes.cellGrid}>
+                            variant="body1"
+                            className={classes.cellGrid}
+                          >
                             {scope}
                           </Typography>
                         ))}
@@ -165,7 +167,8 @@ export default class ScopesetComparison extends Component {
               color="secondary"
               variant="fab"
               onClick={this.handleCompareScopesClick}
-              className={classes.actionButton}>
+              className={classes.actionButton}
+            >
               <ScaleBalanceIcon />
             </Button>
           </Tooltip>