diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-18 09:14:28 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-18 09:14:28 -0600 |
commit | e27eedbd08c7d6191531783f662d576ea940a337 (patch) | |
tree | 06ec271b921b19339d2c5ea68c87b49d2d4f835f /app/javascript/flavours/glitch/features/ui | |
parent | 201e82686f86d06e10afb62184a091417b09d5ad (diff) | |
parent | 708ec07e27dd02d03f2d155bcc61ae8de4c10c4a (diff) |
Merge branch 'gs-master' into merge-upstream
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/modal_root.js | 2 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/upload_area.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.js b/app/javascript/flavours/glitch/features/ui/components/modal_root.js index a3e734867..e12ee1761 100644 --- a/app/javascript/flavours/glitch/features/ui/components/modal_root.js +++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.js @@ -124,7 +124,7 @@ export default class ModalRoot extends React.PureComponent { (<BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}> {(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />} </BundleContainer>) : - null + null } </div> </div> diff --git a/app/javascript/flavours/glitch/features/ui/components/upload_area.js b/app/javascript/flavours/glitch/features/ui/components/upload_area.js index cc6b6d171..11a10baf1 100644 --- a/app/javascript/flavours/glitch/features/ui/components/upload_area.js +++ b/app/javascript/flavours/glitch/features/ui/components/upload_area.js @@ -38,12 +38,12 @@ export default class UploadArea extends React.PureComponent { return ( <Motion defaultStyle={{ backgroundOpacity: 0, backgroundScale: 0.95 }} style={{ backgroundOpacity: spring(active ? 1 : 0, { stiffness: 150, damping: 15 }), backgroundScale: spring(active ? 1 : 0.95, { stiffness: 200, damping: 3 }) }}> {({ backgroundOpacity, backgroundScale }) => - <div className='upload-area' style={{ visibility: active ? 'visible' : 'hidden', opacity: backgroundOpacity }}> + (<div className='upload-area' style={{ visibility: active ? 'visible' : 'hidden', opacity: backgroundOpacity }}> <div className='upload-area__drop'> <div className='upload-area__background' style={{ transform: `scale(${backgroundScale})` }} /> <div className='upload-area__content'><FormattedMessage id='upload_area.title' defaultMessage='Drag & drop to upload' /></div> </div> - </div> + </div>) } </Motion> ); |