diff --git a/client/scss/_asset-preview.scss b/client/scss/_asset-preview.scss index b9290fe6..f420531d 100644 --- a/client/scss/_asset-preview.scss +++ b/client/scss/_asset-preview.scss @@ -31,19 +31,19 @@ h3.asset-preview__title { padding: 0; border: 0; position: absolute; - opacity: .50; - height: 50%; - top: 25%; + opacity: 0.80; + height: 25%; + top: 37.5%; left: 0; right: 0; bottom: 0; z-index: 1000; margin: 0 auto; - background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E %3Cg stroke='lightgray' stroke-width='2' fill='white' fill-rule='evenodd' stroke-linejoin='round'%3E %3Cpolygon points='5 21 5 3 21 12'/%3E %3C/g%3E %3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 60 60' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E %3Cg stroke='black' stroke-width='2' fill='black' fill-rule='evenodd' stroke-linejoin='round'%3E %3Ccircle cx='30' cy='30' r='28'/%3E%3C/g%3E %3Cg stroke='white' stroke-width='1' fill='white' fill-rule='evenodd' stroke-linejoin='round'%3E %3Cpolygon points='25 19 42 30 25 41'/%3E %3C/g%3E %3C/svg%3E"); background-repeat: no-repeat; background-position: center; } .asset-preview__play-wrapper:hover .asset-preview__play-overlay { - opacity: 1.0; + opacity: 0.2; } diff --git a/client/scss/_dropzone.scss b/client/scss/_dropzone.scss index 09b8b1bc..a3934edd 100644 --- a/client/scss/_dropzone.scss +++ b/client/scss/_dropzone.scss @@ -4,6 +4,7 @@ // be a flex container for children display: flex; flex-direction: column; + position: relative; } .dropzone { @@ -12,6 +13,7 @@ flex: 1 0 auto; // be a flex container for children display: flex; + padding: 1em; -webkit-flex-direction: column; flex-direction: column; justify-content: center; @@ -52,8 +54,37 @@ .dropzone-preview-image { display: block; - padding: 1em; - width: calc(100% - 2em); + width: 100%; +} + +.dropzone-preview-memeify { + margin-top: 3em; +} + +.dropzone-memeify-button { + background: $primary-color; + color: #fff; + cursor: pointer; + font-size: .8em; + padding: 3px 6px; + position: absolute; + right: 0; + top: 0; + z-index: 3; +} + +.dropzone-memeify-saveMessage { + padding-top: .25em; + position: relative; + top: .5em; +} + +.dropzone-memeify-toolbar { + /* TODO: Cleanup `!important` */ + background: $primary-color !important; + left: -1em !important; + right: -1em !important; + top: -4em !important; } .dropzone-instructions-display__chooser-label { diff --git a/client/src/components/Creatify/EditableFontface/index.js b/client/src/components/Creatify/EditableFontface/index.js new file mode 100644 index 00000000..2ef131e0 --- /dev/null +++ b/client/src/components/Creatify/EditableFontface/index.js @@ -0,0 +1,99 @@ +import React, { Component } from 'react'; + +const DEFAULT_TEXT_RENDER = (text) => text; + +export default class EditableFontface extends Component { + constructor(props) { + super(props); + + this.state = { + blinkSelection: props.blinkSelection == false ? false : true, + value: props.value, + }; + + this.textInput = React.createRef(); + } + + componentDidMount() { + const textInput = this.textInput.current; + + if(textInput) { + textInput.focus(); + } + } + + render() { + const me = this; + + const { + blinkSelection, + value + } = me.state; + + const { + editable = true, + fontFace, + preview, + } = me.props; + + const textRender = fontFace.textRender || DEFAULT_TEXT_RENDER; + + const textStyles = Object.assign({ + ...(blinkSelection ? { + animation: 'textBlink 1s infinite', + } : {}), + minHeight: '20px', + WebkitFontSmoothing: 'antialiased', + MozOsxFontSmoothing: 'grayscale', + }, fontFace.text, preview ? fontFace.previewOverrides : {}); + + const fontInput = (editable === true) ? ( + me.onKeyPress(e)} onChange={(e) => me.onChange(e)} style={{ + ...{ + bottom: 0, + opacity: 0, + padding: 0, + left: 0, + position: 'absolute', + top: 0, + width: '100%', + zIndex: 1, + }, + ...(fontFace.editorStyle || {}), + }} /> + ) : null; + + return ( +
Video updates are currently disabled. This feature will be available soon. You can edit metadata.
) : ( -