diff options
Diffstat (limited to 'web-ui/src/common')
-rw-r--r-- | web-ui/src/common/input_field/input-field.scss | 4 | ||||
-rw-r--r-- | web-ui/src/common/input_field/input_field.js | 13 | ||||
-rw-r--r-- | web-ui/src/common/submit_button/submit-button.scss | 2 | ||||
-rw-r--r-- | web-ui/src/common/submit_button/submit_button.js | 12 |
4 files changed, 17 insertions, 14 deletions
diff --git a/web-ui/src/common/input_field/input-field.scss b/web-ui/src/common/input_field/input-field.scss index 6ec827ab..dd8e8927 100644 --- a/web-ui/src/common/input_field/input-field.scss +++ b/web-ui/src/common/input_field/input-field.scss @@ -33,8 +33,6 @@ left: 6px; top:10px; transition:0.2s ease all; - -moz-transition:0.2s ease all; - -webkit-transition:0.2s ease all; } .input-field { @@ -61,7 +59,6 @@ @media only screen and (min-width : 500px) { .input-field-group { width: 70%; - -webkit-align-self: center; align-self: center; } } @@ -69,7 +66,6 @@ @media only screen and (min-width : 960px) { .input-field-group { width: 300px; - -webkit-align-self: flex-start; align-self: flex-start; margin-top: 3em; font-size: 1em; diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js index 43899419..1378ba74 100644 --- a/web-ui/src/common/input_field/input_field.js +++ b/web-ui/src/common/input_field/input_field.js @@ -15,15 +15,20 @@ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. */ -import React from 'react' +import React from 'react'; -import './input-field.scss' +import './input-field.scss'; const InputField = ({ label, name }) => ( <div className='input-field-group'> <input type='text' name={name} className='input-field' required /> <label className='input-field-label' htmlFor={name}>{label}</label> </div> -) +); -export default InputField +InputField.propTypes = { + label: React.PropTypes.string.isRequired, + name: React.PropTypes.string.isRequired +}; + +export default InputField; diff --git a/web-ui/src/common/submit_button/submit-button.scss b/web-ui/src/common/submit_button/submit-button.scss index ccd0bef4..13cb7607 100644 --- a/web-ui/src/common/submit_button/submit-button.scss +++ b/web-ui/src/common/submit_button/submit-button.scss @@ -32,7 +32,6 @@ @media only screen and (min-width : 500px) { .submit-button { width: 70%; - -webkit-align-self: center; align-self: center; } } @@ -40,7 +39,6 @@ @media only screen and (min-width : 960px) { .submit-button { width: 300px; - -webkit-align-self: flex-start; align-self: flex-start; font-size: 0.8em; margin-bottom: 1em; diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js index 89cfc55b..fb87bf7d 100644 --- a/web-ui/src/common/submit_button/submit_button.js +++ b/web-ui/src/common/submit_button/submit_button.js @@ -15,12 +15,16 @@ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. */ -import React from 'react' +import React from 'react'; -import './submit-button.scss' +import './submit-button.scss'; const SubmitButton = ({ buttonText }) => ( <input type='submit' className='submit-button' value={buttonText} /> -) +); -export default SubmitButton +SubmitButton.propTypes = { + buttonText: React.PropTypes.string.isRequired +}; + +export default SubmitButton; |