Skip to content
Snippets Groups Projects
Commit 708ec3be authored by vkovtun's avatar vkovtun
Browse files

SSDM-13579: Made toggle button look nicer.

parent bb989506
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -48,7 +48,7 @@ const styles = theme => ({ ...@@ -48,7 +48,7 @@ const styles = theme => ({
}, },
content: { content: {
flex: '1 1 100%', flex: '1 1 100%',
height: 'calc(100vh - ' + theme.spacing(10) + 'px)', height: 0,
overflowY: 'hidden' overflowY: 'hidden'
} }
}) })
......
...@@ -28,6 +28,7 @@ import CreateNewFolderIcon from '@material-ui/icons/CreateNewFolderOutlined' ...@@ -28,6 +28,7 @@ import CreateNewFolderIcon from '@material-ui/icons/CreateNewFolderOutlined'
import autoBind from 'auto-bind' import autoBind from 'auto-bind'
import { ToggleButton } from '@material-ui/lab' import { ToggleButton } from '@material-ui/lab'
import Button from '@material-ui/core/Button' import Button from '@material-ui/core/Button'
import IconButton from '@material-ui/core/IconButton'
const color = 'secondary' const color = 'secondary'
...@@ -37,15 +38,13 @@ const styles = (theme) => ({ ...@@ -37,15 +38,13 @@ const styles = (theme) => ({
display: 'flex', display: 'flex',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
marginLeft: theme.spacing(1), marginLeft: theme.spacing(1),
marginBottom: theme.spacing(1) marginBottom: theme.spacing(1),
marginRight: theme.spacing(1)
}, },
buttons: { buttons: {
flex: '0 0 auto', flex: '0 0 auto',
display: 'flex', display: 'flex',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
'& button': {
marginRight: theme.spacing(1)
}
}, },
leftSection: { leftSection: {
flexGrow: 1, flexGrow: 1,
...@@ -54,8 +53,10 @@ const styles = (theme) => ({ ...@@ -54,8 +53,10 @@ const styles = (theme) => ({
flexShrink: 0 flexShrink: 0
}, },
toggleButton: { toggleButton: {
marginRight: theme.spacing(1), border: 'none',
border: '1px solid ' + theme.palette[color].main + '80', borderRadius: '50%',
display: 'inline-flex',
padding: theme.spacing(1.5) + 'px',
'& *': { '& *': {
color: theme.palette[color].main color: theme.palette[color].main
} }
...@@ -72,14 +73,15 @@ class Toolbar extends React.Component { ...@@ -72,14 +73,15 @@ class Toolbar extends React.Component {
render() { render() {
const { viewType, onViewTypeChange, classes, showInfo, onShowInfoChange } = const { viewType, onViewTypeChange, classes, showInfo, onShowInfoChange } =
this.props this.props
const size = 'small' const buttonSize = 'small'
const iconButtonSize = 'medium'
return ( return (
<div className={classes.toolbar}> <div className={classes.toolbar}>
<div className={[classes.buttons, classes.leftSection].join(' ')}> <div className={[classes.buttons, classes.leftSection].join(' ')}>
<Button <Button
classes={{ root: classes.button }} classes={{ root: classes.button }}
color={color} color={color}
size={size} size={buttonSize}
variant='outlined' variant='outlined'
startIcon={<CreateNewFolderIcon />} startIcon={<CreateNewFolderIcon />}
> >
...@@ -90,7 +92,7 @@ class Toolbar extends React.Component { ...@@ -90,7 +92,7 @@ class Toolbar extends React.Component {
<ToggleButton <ToggleButton
classes={{ root: classes.toggleButton }} classes={{ root: classes.toggleButton }}
color={color} color={color}
size={size} size={buttonSize}
selected={showInfo} selected={showInfo}
onChange={onShowInfoChange} onChange={onShowInfoChange}
value={messages.get(messages.INFO)} value={messages.get(messages.INFO)}
...@@ -98,52 +100,50 @@ class Toolbar extends React.Component { ...@@ -98,52 +100,50 @@ class Toolbar extends React.Component {
> >
<InfoIcon /> <InfoIcon />
</ToggleButton> </ToggleButton>
<Button <IconButton
classes={{ root: classes.button }} classes={{ root: classes.button }}
color={color} color={color}
size={size} size={iconButtonSize}
variant='outlined' variant='outlined'
> >
<SearchIcon /> <SearchIcon />
</Button> </IconButton>
{viewType === 'list' && ( {viewType === 'list' && (
<Button <IconButton
classes={{ root: classes.button }} classes={{ root: classes.button }}
color={color} color={color}
size={size} size={iconButtonSize}
variant='outlined' variant='outlined'
onClick={() => onViewTypeChange('grid')} onClick={() => onViewTypeChange('grid')}
> >
<ViewComfyIcon /> <ViewComfyIcon />
</Button> </IconButton>
)} )}
{viewType === 'grid' && ( {viewType === 'grid' && (
<Button <IconButton
classes={{ root: classes.button }} classes={{ root: classes.button }}
color={color} color={color}
size={size} size={iconButtonSize}
variant='outlined' variant='outlined'
onClick={() => onViewTypeChange('list')} onClick={() => onViewTypeChange('list')}
> >
<ViewListIcon /> <ViewListIcon />
</Button> </IconButton>
)} )}
<Button <IconButton
classes={{ root: classes.button }} classes={{ root: classes.button }}
color={color} color={color}
size={size} size={iconButtonSize}
variant='outlined' variant='outlined'
onClick={() => onViewTypeChange('list')}
> >
<SettingsIcon /> <SettingsIcon />
</Button> </IconButton>
<Button <Button
classes={{ root: classes.button }} classes={{ root: classes.button }}
color={color} color={color}
size={size} size={buttonSize}
variant='contained' variant='contained'
startIcon={<PublishIcon />} startIcon={<PublishIcon />}
onClick={() => onViewTypeChange('list')}
> >
{messages.get(messages.UPLOAD)} {messages.get(messages.UPLOAD)}
</Button> </Button>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment