diff --git a/packages/vulcan-forms/lib/components/FormGroup.jsx b/packages/vulcan-forms/lib/components/FormGroup.jsx index ab6a9e297..abb5d7d14 100644 --- a/packages/vulcan-forms/lib/components/FormGroup.jsx +++ b/packages/vulcan-forms/lib/components/FormGroup.jsx @@ -4,50 +4,6 @@ import { Components } from 'meteor/vulcan:core'; import classNames from 'classnames'; import { registerComponent } from 'meteor/vulcan:core'; -const IconRight = ({ width = 24, height = 24 }) => ( - - - - -); - -registerComponent('IconRight', IconRight); - -const IconDown = ({ width = 24, height = 24 }) => ( - - - - -); - -registerComponent('IconDown', IconDown); - class FormGroup extends PureComponent { constructor(props) { super(props); @@ -112,3 +68,47 @@ FormGroup.propTypes = { }; registerComponent('FormGroup', FormGroup); + +const IconRight = ({ width = 24, height = 24 }) => ( + + + + +); + +registerComponent('IconRight', IconRight); + +const IconDown = ({ width = 24, height = 24 }) => ( + + + + +); + +registerComponent('IconDown', IconDown); diff --git a/packages/vulcan-forms/lib/components/FormNested.jsx b/packages/vulcan-forms/lib/components/FormNested.jsx index 341b5585c..c7d275576 100644 --- a/packages/vulcan-forms/lib/components/FormNested.jsx +++ b/packages/vulcan-forms/lib/components/FormNested.jsx @@ -3,10 +3,7 @@ import PropTypes from 'prop-types'; import { Components, registerComponent } from 'meteor/vulcan:core'; import Button from 'react-bootstrap/lib/Button'; -const FormNestedItem = ( - { nestedFields, name, path, removeItem, itemIndex, ...props }, - { errors } -) => { +const FormNestedItem = ({ nestedFields, name, path, removeItem, itemIndex, ...props }, { errors }) => { return (
@@ -24,12 +21,14 @@ const FormNestedItem = (
@@ -85,8 +84,8 @@ class FormNested extends PureComponent { /> ) )} -
@@ -99,3 +98,19 @@ FormNested.contextTypes = { }; registerComponent('FormNested', FormNested); + +const IconAdd = ({ width = 24, height = 24 }) => ( + + + +); + +registerComponent('IconAdd', IconAdd); + +const IconRemove = ({ width = 24, height = 24 }) => ( + + + +); + +registerComponent('IconRemove', IconRemove); diff --git a/packages/vulcan-forms/lib/stylesheets/style.scss b/packages/vulcan-forms/lib/stylesheets/style.scss index 57043aba4..6bb6345d5 100644 --- a/packages/vulcan-forms/lib/stylesheets/style.scss +++ b/packages/vulcan-forms/lib/stylesheets/style.scss @@ -238,16 +238,21 @@ div.ReactTags__suggestions mark{ } } -.form-nested-item-deleted{ - opacity: 0.3; - .form-nested-item-deleted-overlay{ - display: block; - } -} - .form-nested-item-inner{ flex: 1; } .form-nested-item-remove{ margin-left: 10px; +} +.form-nested-button{ + display: flex; + justify-content: center; + align-items: center; + svg{ + display:block; + path{ + fill: rgba(255,255,255,0.7); + stroke: rgba(255,255,255,0.7); + } + } } \ No newline at end of file