Skip to content

Fab button #743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 1, 2019
Merged

Fab button #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c977a8
Updated FAB button on content page
martinfrances107 May 20, 2019
b8d20fd
more Fab Button upgrades
martinfrances107 May 20, 2019
8e48301
Merge branch 'master' into FABButton
dawehner May 20, 2019
f43484f
retest
martinfrances107 May 23, 2019
fb8aff4
Merge branch 'master' into FABButton
martinfrances107 Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js
View file
Open in desktop
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
7 changes: 3 additions & 4 deletions packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js
View file
Open in desktop
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
View file
Open in desktop
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
7 changes: 3 additions & 4 deletions packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js
View file
Open in desktop
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