From 05899341697a08cac9aff833ce298f8e33f26cfc Mon Sep 17 00:00:00 2001 From: Shawn Erquhart Date: Fri, 19 May 2017 13:00:53 -0400 Subject: [PATCH] update file widget to match image widget --- .../{ImageControl.css => FileControl.css} | 0 src/components/Widgets/FileControl.js | 31 +++++-------------- src/components/Widgets/ImageControl.js | 2 +- 3 files changed, 8 insertions(+), 25 deletions(-) rename src/components/Widgets/{ImageControl.css => FileControl.css} (100%) diff --git a/src/components/Widgets/ImageControl.css b/src/components/Widgets/FileControl.css similarity index 100% rename from src/components/Widgets/ImageControl.css rename to src/components/Widgets/FileControl.css diff --git a/src/components/Widgets/FileControl.js b/src/components/Widgets/FileControl.js index 04ce1761..468b4107 100644 --- a/src/components/Widgets/FileControl.js +++ b/src/components/Widgets/FileControl.js @@ -2,6 +2,7 @@ import React, { PropTypes } from 'react'; import { truncateMiddle } from '../../lib/textHelper'; import { Loader } from '../UI'; import AssetProxy, { createAssetProxy } from '../../valueObjects/AssetProxy'; +import styles from './FileControl.css'; const MAX_DISPLAY_LENGTH = 50; @@ -77,8 +78,8 @@ export default class FileControl extends React.Component { const fileName = this.renderFileName(); if (processing) { return ( -
- +
+
@@ -86,18 +87,18 @@ export default class FileControl extends React.Component { } return (
- - {fileName ? fileName : 'Tip: Click here to select a file to upload, or drag an image directly into this box from your desktop'} + + {fileName ? fileName : 'Click here to upload a file from your computer, or drag and drop a file directly into this box'}
@@ -105,24 +106,6 @@ export default class FileControl extends React.Component { } } -const styles = { - input: { - display: 'none', - }, - message: { - padding: '20px', - display: 'block', - fontSize: '12px', - }, - imageUpload: { - backgroundColor: '#fff', - textAlign: 'center', - color: '#999', - border: '1px dashed #eee', - cursor: 'pointer', - }, -}; - FileControl.propTypes = { onAddAsset: PropTypes.func.isRequired, onChange: PropTypes.func.isRequired, diff --git a/src/components/Widgets/ImageControl.js b/src/components/Widgets/ImageControl.js index f81f1f29..cd8fb46b 100644 --- a/src/components/Widgets/ImageControl.js +++ b/src/components/Widgets/ImageControl.js @@ -2,7 +2,7 @@ import React, { PropTypes } from 'react'; import { truncateMiddle } from '../../lib/textHelper'; import { Loader } from '../UI'; import AssetProxy, { createAssetProxy } from '../../valueObjects/AssetProxy'; -import styles from './ImageControl.css'; +import styles from './FileControl.css'; const MAX_DISPLAY_LENGTH = 50;