diff options
Diffstat (limited to 'modern/src')
| -rw-r--r-- | modern/src/common/components/NavBar.js | 1 | ||||
| -rw-r--r-- | modern/src/common/components/PageLayout.js | 4 | ||||
| -rw-r--r-- | modern/src/login/LoginPage.js | 5 | ||||
| -rw-r--r-- | modern/src/main/MainPage.js | 10 | ||||
| -rw-r--r-- | modern/src/main/StatusCard.js | 7 | ||||
| -rw-r--r-- | modern/src/other/EventPage.js | 2 | ||||
| -rw-r--r-- | modern/src/other/GeofencesPage.js | 2 | ||||
| -rw-r--r-- | modern/src/other/PositionPage.js | 2 | ||||
| -rw-r--r-- | modern/src/other/ReplayPage.js | 18 | ||||
| -rw-r--r-- | modern/src/settings/UserPage.js | 1 | ||||
| -rw-r--r-- | modern/src/settings/components/EditAttributesView.js | 5 |
11 files changed, 17 insertions, 40 deletions
diff --git a/modern/src/common/components/NavBar.js b/modern/src/common/components/NavBar.js index 09560176..a1a73fdf 100644 --- a/modern/src/common/components/NavBar.js +++ b/modern/src/common/components/NavBar.js @@ -8,7 +8,6 @@ const Navbar = ({ setOpenDrawer, title }) => ( <AppBar position="sticky" color="inherit"> <Toolbar> <IconButton - size="large" color="inherit" edge="start" onClick={() => setOpenDrawer(true)} diff --git a/modern/src/common/components/PageLayout.js b/modern/src/common/components/PageLayout.js index 5360a554..17567fb1 100644 --- a/modern/src/common/components/PageLayout.js +++ b/modern/src/common/components/PageLayout.js @@ -81,7 +81,7 @@ const PageLayout = ({ menu, breadcrumbs, children }) => { > <div className={classes.toolbar}> <Toolbar> - <IconButton size="large" color="inherit" edge="start" onClick={() => navigate('/')}> + <IconButton color="inherit" edge="start" onClick={() => navigate('/')}> <ArrowBackIcon /> </IconButton> <PageTitle breadcrumbs={breadcrumbs} /> @@ -106,7 +106,7 @@ const PageLayout = ({ menu, breadcrumbs, children }) => { </Drawer> <AppBar position="static" color="inherit"> <Toolbar> - <IconButton size="large" color="inherit" edge="start" onClick={() => setOpenDrawer(true)}> + <IconButton color="inherit" edge="start" onClick={() => setOpenDrawer(true)}> <MenuIcon /> </IconButton> <PageTitle breadcrumbs={breadcrumbs} /> diff --git a/modern/src/login/LoginPage.js b/modern/src/login/LoginPage.js index 8e5467ac..8bef8b07 100644 --- a/modern/src/login/LoginPage.js +++ b/modern/src/login/LoginPage.js @@ -89,10 +89,7 @@ const LoginPage = () => { return ( <LoginLayout> <Tooltip title="Switch to Legacy App" className={classes.legacy}> - <IconButton - size="large" - onClick={() => window.localStorage.setItem('legacyApp', true) || window.location.replace('/')} - > + <IconButton onClick={() => window.localStorage.setItem('legacyApp', true) || window.location.replace('/')}> <CachedIcon /> </IconButton> </Tooltip> diff --git a/modern/src/main/MainPage.js b/modern/src/main/MainPage.js index 7235d1b4..059d7043 100644 --- a/modern/src/main/MainPage.js +++ b/modern/src/main/MainPage.js @@ -167,7 +167,7 @@ const MainPage = () => { <Paper square elevation={3}> <Toolbar className={classes.toolbar} disableGutters> {!desktop && ( - <IconButton size="large" onClick={handleClose}> + <IconButton onClick={handleClose}> <ArrowBackIcon /> </IconButton> )} @@ -179,15 +179,11 @@ const MainPage = () => { onChange={(event) => setSearchKeyword(event.target.value)} placeholder={t('sharedSearchDevices')} /> - <IconButton - size="large" - onClick={() => navigate('/settings/device')} - disabled={deviceReadonly} - > + <IconButton onClick={() => navigate('/settings/device')} disabled={deviceReadonly}> <AddIcon /> </IconButton> {desktop && ( - <IconButton size="large" onClick={handleClose}> + <IconButton onClick={handleClose}> <CloseIcon /> </IconButton> )} diff --git a/modern/src/main/StatusCard.js b/modern/src/main/StatusCard.js index 37e4a1d1..ec33efa2 100644 --- a/modern/src/main/StatusCard.js +++ b/modern/src/main/StatusCard.js @@ -115,7 +115,7 @@ const StatusCard = ({ deviceId, onClose }) => { </Avatar> )} action={( - <IconButton size="large" onClick={onClose}> + <IconButton onClick={onClose}> <CloseIcon /> </IconButton> )} @@ -148,35 +148,30 @@ const StatusCard = ({ deviceId, onClose }) => { <CardActions classes={{ root: classes.actions }} disableSpacing> <IconButton color="secondary" - size="large" onClick={() => navigate(`/position/${position.id}`)} disabled={!position} > <PostAddIcon /> </IconButton> <IconButton - size="large" onClick={() => navigate('/replay')} disabled={!position} > <ReplayIcon /> </IconButton> <IconButton - size="large" onClick={() => navigate(`/settings/command-send/${deviceId}`)} disabled={readonly} > <PublishIcon /> </IconButton> <IconButton - size="large" onClick={() => navigate(`/settings/device/${deviceId}`)} disabled={deviceReadonly} > <EditIcon /> </IconButton> <IconButton - size="large" onClick={() => setRemoving(true)} disabled={deviceReadonly} className={classes.negative} diff --git a/modern/src/other/EventPage.js b/modern/src/other/EventPage.js index d2f12ed1..f4427ca9 100644 --- a/modern/src/other/EventPage.js +++ b/modern/src/other/EventPage.js @@ -61,7 +61,7 @@ const EventPage = () => { <div className={classes.root}> <AppBar color="inherit" position="static"> <Toolbar> - <IconButton size="large" color="inherit" edge="start" onClick={() => navigate('/')}> + <IconButton color="inherit" edge="start" onClick={() => navigate('/')}> <ArrowBackIcon /> </IconButton> <Typography variant="h6">{t('positionEvent')}</Typography> diff --git a/modern/src/other/GeofencesPage.js b/modern/src/other/GeofencesPage.js index 6f60ce42..6706ec98 100644 --- a/modern/src/other/GeofencesPage.js +++ b/modern/src/other/GeofencesPage.js @@ -66,7 +66,7 @@ const GeofencesPage = () => { classes={{ paper: classes.drawerPaper }} > <div className={classes.drawerHeader}> - <IconButton size="large" onClick={() => navigate(-1)}> + <IconButton onClick={() => navigate(-1)}> <ArrowBackIcon /> </IconButton> <Typography variant="h6" color="inherit" noWrap> diff --git a/modern/src/other/PositionPage.js b/modern/src/other/PositionPage.js index 2c755a5a..61c40902 100644 --- a/modern/src/other/PositionPage.js +++ b/modern/src/other/PositionPage.js @@ -74,7 +74,7 @@ const PositionPage = () => { <div className={classes.root}> <AppBar position="sticky" color="inherit"> <Toolbar> - <IconButton size="large" color="inherit" edge="start" onClick={() => navigate(-1)}> + <IconButton color="inherit" edge="start" onClick={() => navigate(-1)}> <ArrowBackIcon /> </IconButton> <Typography variant="h6"> diff --git a/modern/src/other/ReplayPage.js b/modern/src/other/ReplayPage.js index 4b3c4c09..1c82c913 100644 --- a/modern/src/other/ReplayPage.js +++ b/modern/src/other/ReplayPage.js @@ -147,13 +147,13 @@ const ReplayPage = () => { <div className={classes.sidebar}> <Paper elevation={3} square> <Toolbar> - <IconButton size="large" onClick={() => navigate('/')}> + <IconButton onClick={() => navigate('/')}> <ArrowBackIcon /> </IconButton> <Typography variant="h6" className={classes.title}>{t('reportReplay')}</Typography> {!expanded && ( <Grid item> - <IconButton size="large" onClick={() => setExpanded(true)}> + <IconButton onClick={() => setExpanded(true)}> <SettingsIcon /> </IconButton> </Grid> @@ -177,21 +177,13 @@ const ReplayPage = () => { /> <div className={classes.controls}> {`${index + 1}/${positions.length}`} - <IconButton - size="large" - onClick={() => setIndex((index) => index - 1)} - disabled={playing} - > + <IconButton onClick={() => setIndex((index) => index - 1)} disabled={playing}> <FastRewindIcon /> </IconButton> - <IconButton onClick={() => setPlaying(!playing)} size="large"> + <IconButton onClick={() => setPlaying(!playing)}> {playing ? <PauseIcon /> : <PlayArrowIcon /> } </IconButton> - <IconButton - size="large" - onClick={() => setIndex((index) => index + 1)} - disabled={playing} - > + <IconButton onClick={() => setIndex((index) => index + 1)} disabled={playing}> <FastForwardIcon /> </IconButton> {formatTime(positions[index].fixTime)} diff --git a/modern/src/settings/UserPage.js b/modern/src/settings/UserPage.js index d279fce3..48769557 100644 --- a/modern/src/settings/UserPage.js +++ b/modern/src/settings/UserPage.js @@ -218,7 +218,6 @@ const UserPage = () => { endAdornment={( <InputAdornment position="end"> <IconButton - size="large" onClick={() => { const token = [...Array(30)].map(() => Math.random().toString(36)[2]).join(''); setItem({ ...item, token }); diff --git a/modern/src/settings/components/EditAttributesView.js b/modern/src/settings/components/EditAttributesView.js index d714c489..e6e1ddf0 100644 --- a/modern/src/settings/components/EditAttributesView.js +++ b/modern/src/settings/components/EditAttributesView.js @@ -166,7 +166,7 @@ const EditAttributesView = ({ attributes, setAttributes, definitions }) => { )} label={getAttributeName(key, subtype)} /> - <IconButton size="large" className={classes.removeButton} onClick={() => deleteAttribute(key)}> + <IconButton className={classes.removeButton} onClick={() => deleteAttribute(key)}> <CloseIcon /> </IconButton> </Grid> @@ -181,7 +181,7 @@ const EditAttributesView = ({ attributes, setAttributes, definitions }) => { onChange={(e) => updateAttribute(key, e.target.value, type, subtype)} endAdornment={( <InputAdornment position="end"> - <IconButton size="large" onClick={() => deleteAttribute(key)}> + <IconButton onClick={() => deleteAttribute(key)}> <CloseIcon /> </IconButton> </InputAdornment> @@ -191,7 +191,6 @@ const EditAttributesView = ({ attributes, setAttributes, definitions }) => { ); })} <Button - size="large" variant="outlined" color="primary" onClick={() => setAddDialogShown(true)} |