From ac2553c77bc69378166ec0aea7cf96d45ed551c4 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Mon, 16 Sep 2019 13:52:00 -0700 Subject: [PATCH 1/2] refactor: use catalyst button for media uploader Signed-off-by: Machiko Yasuda --- .../plugins/core/ui/client/components/media/mediaUploader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imports/plugins/core/ui/client/components/media/mediaUploader.js b/imports/plugins/core/ui/client/components/media/mediaUploader.js index eac2e47cdab..cf10666a29e 100644 --- a/imports/plugins/core/ui/client/components/media/mediaUploader.js +++ b/imports/plugins/core/ui/client/components/media/mediaUploader.js @@ -2,7 +2,7 @@ import React, { useState } from "react"; import PropTypes from "prop-types"; import { Meteor } from "meteor/meteor"; import { useDropzone } from "react-dropzone"; -import Button from "@material-ui/core/Button"; +import Button from "@reactioncommerce/catalyst/Button"; import LinearProgress from "@material-ui/core/LinearProgress"; import { FileRecord } from "@reactioncommerce/file-collections"; import { registerComponent } from "@reactioncommerce/reaction-components"; @@ -92,7 +92,7 @@ function MediaUploader(props) { return (
- {isUploading ? : } + {isUploading ? : }
); } From 6b4364f2fbea9ef90bd220a829ba3ca71d351a5f Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Mon, 16 Sep 2019 15:06:10 -0700 Subject: [PATCH 2/2] chore: lint Signed-off-by: Machiko Yasuda --- .../core/ui/client/components/media/mediaUploader.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/imports/plugins/core/ui/client/components/media/mediaUploader.js b/imports/plugins/core/ui/client/components/media/mediaUploader.js index cf10666a29e..5a60ab18d89 100644 --- a/imports/plugins/core/ui/client/components/media/mediaUploader.js +++ b/imports/plugins/core/ui/client/components/media/mediaUploader.js @@ -92,7 +92,11 @@ function MediaUploader(props) { return (
- {isUploading ? : } + {isUploading ? + + : + + }
); }