From 3c977a810d47ec3f13b11866ff49c586e0a0c4c3 Mon Sep 17 00:00:00 2001 From: Martin Frances Date: Mon, 20 May 2019 11:38:37 +0100 Subject: [PATCH 1/3] Updated FAB button on content page --- .../admin-ui/src/components/05_pages/Content/Content.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/admin-ui/src/components/05_pages/Content/Content.js b/packages/admin-ui/src/components/05_pages/Content/Content.js index 5a86d50a5..035503d0f 100644 --- a/packages/admin-ui/src/components/05_pages/Content/Content.js +++ b/packages/admin-ui/src/components/05_pages/Content/Content.js @@ -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'; @@ -310,8 +311,7 @@ class Content extends Component { )} - + Date: Mon, 20 May 2019 11:59:55 +0100 Subject: [PATCH 2/3] more Fab Button upgrades --- .../components/02_atoms/MultipleFields/MultipleFields.js | 6 +++--- .../src/components/02_atoms/Widgets/FileUploadWidget.js | 7 +++---- .../TaxonomyTermsOverview/TaxonomyTermsOverview.js | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js b/packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js index 63a0d5ab9..c40e114b6 100644 --- a/packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js +++ b/packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js @@ -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'; @@ -210,9 +211,8 @@ class MultipleFields extends Component { })} - + ))} diff --git a/packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js b/packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js index cafb1211b..c167c8481 100644 --- a/packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js +++ b/packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js @@ -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'; @@ -250,10 +250,9 @@ class FileUploadWidget extends React.Component { ) } /> - + {!last && } diff --git a/packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js b/packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js index 0b7773409..35d549a90 100644 --- a/packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js +++ b/packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js @@ -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'; @@ -119,8 +119,7 @@ export default class TaxonomyTermsOverview extends React.Component { - + ); } From f43484f92360f1b4c3a9f58c2d93223b0a5bf275 Mon Sep 17 00:00:00 2001 From: Martin Frances Date: Thu, 23 May 2019 11:08:25 +0100 Subject: [PATCH 3/3] retest