Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / views / ssh-key-panel / ssh-key-panel-root.tsx

diff --git a/src/views/ssh-key-panel/ssh-key-panel-root.tsx b/src/views/ssh-key-panel/ssh-key-panel-root.tsx
index 2cdad07dd14fb774ca9260d87b1c4a2285c40e52..8a266d00c6f146cc7bb0a5853e236224262f8f8f 100644 (file)
--- a/src/views/ssh-key-panel/ssh-key-panel-root.tsx
+++ b/src/views/ssh-key-panel/ssh-key-panel-root.tsx
@@ -2,11 +2,11 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from 'react';
+import React from 'react';
 import { StyleRulesCallback, WithStyles, withStyles, Card, CardContent, Button, Typography, Grid, Table, TableHead, TableRow, TableCell, TableBody, Tooltip, IconButton } from '@material-ui/core';
-import { ArvadosTheme } from '~/common/custom-theme';
-import { SshKeyResource } from '~/models/ssh-key';
-import { AddIcon, MoreOptionsIcon, KeyIcon } from '~/components/icon/icon';
+import { ArvadosTheme } from 'common/custom-theme';
+import { SshKeyResource } from 'models/ssh-key';
+import { AddIcon, MoreVerticalIcon, KeyIcon } from 'components/icon/icon';
 
 type CssRules = 'root' | 'link' | 'buttonContainer' | 'table' | 'tableRow' | 'keyIcon';
 
@@ -55,14 +55,14 @@ export const SshKeyPanelRoot = withStyles(styles)(
             <CardContent>
                 <Grid container direction="row">
                     <Grid item xs={8}>
-                        { !hasKeys && <Typography variant='body1' paragraph={true} >
+                        { !hasKeys && <Typography  paragraph={true} >
                             You have not yet set up an SSH public key for use with Arvados.
                             <a href='https://doc.arvados.org/user/getting_started/ssh-access-unix.html'
                                 target='blank' className={classes.link}>
                                 Learn more.
                             </a>
                         </Typography>}
-                        { !hasKeys && <Typography variant='body1' paragraph={true}>
+                        { !hasKeys && <Typography  paragraph={true}>
                             When you have an SSH key you would like to use, add it using button below.
                         </Typography> }
                     </Grid>
@@ -103,7 +103,7 @@ export const SshKeyPanelRoot = withStyles(styles)(
                                     <TableCell>
                                         <Tooltip title="More options" disableFocusListener>
                                             <IconButton onClick={event => openRowOptions(event, sshKey)}>
-                                                <MoreOptionsIcon />
+                                                <MoreVerticalIcon />
                                             </IconButton>
                                         </Tooltip>
                                     </TableCell>
@@ -113,4 +113,4 @@ export const SshKeyPanelRoot = withStyles(styles)(
                 </Grid>
             </CardContent>
         </Card>
-    );
\ No newline at end of file
+    );