diff --git a/client/build/components/DropzoneInstructionsDisplay/index.js b/client/build/components/DropzoneInstructionsDisplay/index.js index fdaec59e..04139032 100644 --- a/client/build/components/DropzoneInstructionsDisplay/index.js +++ b/client/build/components/DropzoneInstructionsDisplay/index.js @@ -9,22 +9,26 @@ var _react = _interopRequireDefault(require("react")); var _FormFeedbackDisplay = _interopRequireDefault(require("@components/FormFeedbackDisplay")); +var _Row = _interopRequireDefault(require("@components/Row")); + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var DropzoneInstructionsDisplay = function DropzoneInstructionsDisplay(_ref) { var fileError = _ref.fileError; return _react.default.createElement("div", { className: 'dropzone-instructions-display' - }, _react.default.createElement("p", { + }, _react.default.createElement(_Row.default, null, _react.default.createElement("p", { className: 'text--large' - }, "Drag & drop image or video here to publish"), _react.default.createElement("p", { + }, "Drag & drop image or video here to publish")), _react.default.createElement(_Row.default, null, _react.default.createElement("p", { className: 'text--small' - }, "OR"), _react.default.createElement("p", { + }, "OR")), fileError ? _react.default.createElement("div", null, _react.default.createElement(_Row.default, null, _react.default.createElement("p", { className: 'text--large text--underline' - }, "CHOOSE FILE"), _react.default.createElement(_FormFeedbackDisplay.default, { + }, "CHOOSE FILE")), _react.default.createElement(_FormFeedbackDisplay.default, { errorMessage: fileError, defaultMessage: false - })); + })) : _react.default.createElement("p", { + className: 'text--large text--underline' + }, "CHOOSE FILE")); }; var _default = DropzoneInstructionsDisplay; diff --git a/client/scss/_variables.scss b/client/scss/_variables.scss index 2716def5..26f125d8 100644 --- a/client/scss/_variables.scss +++ b/client/scss/_variables.scss @@ -8,6 +8,7 @@ $failure-color: red; $primary-padding: 3em; $secondary-padding: 2em; +$tertiary-padding: 1em; $thin-padding: 0.3em; $full-width-thin-padding: calc(100% - 0.6em); diff --git a/client/scss/components/_nav-bar.scss b/client/scss/components/_nav-bar.scss index e61211bf..8d5e3f37 100644 --- a/client/scss/components/_nav-bar.scss +++ b/client/scss/components/_nav-bar.scss @@ -8,7 +8,7 @@ } .nav-bar-link { - padding: $secondary-padding; + padding: calc(1em - 2px); display: inline-block; } diff --git a/client/src/components/DropzoneInstructionsDisplay/index.jsx b/client/src/components/DropzoneInstructionsDisplay/index.jsx index cb06392b..3f13c69f 100644 --- a/client/src/components/DropzoneInstructionsDisplay/index.jsx +++ b/client/src/components/DropzoneInstructionsDisplay/index.jsx @@ -1,16 +1,29 @@ import React from 'react'; import FormFeedbackDisplay from '@components/FormFeedbackDisplay'; +import Row from '@components/Row'; const DropzoneInstructionsDisplay = ({fileError}) => { return (
-

Drag & drop image or video here to publish

-

OR

-

CHOOSE FILE

- + +

Drag & drop image or video here to publish

+
+ +

OR

+
+ { fileError ? ( +
+ +

CHOOSE FILE

+
+ +
+ ) : ( +

CHOOSE FILE

+ )}
); };