Skip to content

Commit

Permalink
Merge pull request #743 from martinfrances107/FABButton
Browse files Browse the repository at this point in the history
Fab button
  • Loading branch information
martinfrances107 authored Jun 1, 2019
2 parents c9bf8a5 + fb8aff4 commit c9854f5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import ListItem from '@material-ui/core/ListItem';
import DeleteIcon from '@material-ui/icons/Delete';
import FormLabel from '@material-ui/core/FormLabel';
import ReorderIcon from '@material-ui/icons/Reorder';
import Fab from '@material-ui/core/Fab';
import FormControl from '@material-ui/core/FormControl';
import ListItemText from '@material-ui/core/ListItemText';
import ListItemIcon from '@material-ui/core/ListItemIcon';
Expand Down Expand Up @@ -210,9 +211,8 @@ class MultipleFields extends Component {
})}
</ListItemText>
<Fragment>
<Button
<Fab
mini
variant="fab"
color="secondary"
className="remove"
aria-label="Remove Image"
Expand All @@ -224,7 +224,7 @@ class MultipleFields extends Component {
}}
>
<DeleteIcon />
</Button>
</Fab>
</Fragment>
</ListItem>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import FormLabel from '@material-ui/core/FormLabel';
import TextField from '@material-ui/core/TextField';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import Button from '@material-ui/core/Button';
import Fab from '@material-ui/core/Fab';
import DeleteIcon from '@material-ui/icons/Delete';

import WidgetPropTypes from '../../05_pages/NodeForm/WidgetPropTypes';
Expand Down Expand Up @@ -250,10 +250,9 @@ class FileUploadWidget extends React.Component {
)
}
/>
<Button
<Fab
mini
id={id}
variant="fab"
color="secondary"
className="remove"
aria-label="Remove Image"
Expand All @@ -268,7 +267,7 @@ class FileUploadWidget extends React.Component {
}}
>
<DeleteIcon />
</Button>
</Fab>
</ListItem>
{!last && <Divider />}
</Fragment>
Expand Down
6 changes: 3 additions & 3 deletions packages/admin-ui/src/components/05_pages/Content/Content.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Paper from '@material-ui/core/Paper';
import Input from '@material-ui/core/Input';
import InputLabel from '@material-ui/core/InputLabel';
import MenuItem from '@material-ui/core/MenuItem';
import Fab from '@material-ui/core/Fab';
import FormControl from '@material-ui/core/FormControl';
import ListItemText from '@material-ui/core/ListItemText';
import Select from '@material-ui/core/Select';
Expand Down Expand Up @@ -310,16 +311,15 @@ class Content extends Component {
</Fragment>
)}

<Button
variant="fab"
<Fab
color="primary"
aria-label="add"
className={styles.addButton}
component={Link}
to="/node/add"
>
<AddIcon />
</Button>
</Fab>
</div>
<ContentTable
pageChangeHandler={this.pageChangeHandler}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';

import Button from '@material-ui/core/Button';
import Fab from '@material-ui/core/Fab';
import AddIcon from '@material-ui/icons/Add';

import FormControl from '@material-ui/core/FormControl';
Expand Down Expand Up @@ -119,16 +119,15 @@ export default class TaxonomyTermsOverview extends React.Component {
</TableBody>
</Table>
</Paper>
<Button
variant="fab"
<Fab
color="primary"
aria-label="add"
className={styles.addButton}
component={Link}
to={`/admin/structure/taxonomy/manage/${this.props.vocabulary}/add`}
>
<AddIcon />
</Button>
</Fab>
</Fragment>
);
}
Expand Down

0 comments on commit c9854f5

Please sign in to comment.