diff --git a/js/components/ascribe_buttons/button_submit.js b/js/components/ascribe_buttons/button_submit.js deleted file mode 100644 index ef5999cd..00000000 --- a/js/components/ascribe_buttons/button_submit.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -import React from 'react'; - -let ButtonSubmitOrClose = React.createClass({ - propTypes: { - submitted: React.PropTypes.bool.isRequired, - text: React.PropTypes.string.isRequired - }, - - render() { - if (this.props.submitted){ - return ( -
- -
- ); - } - return ( -
- -
- ); - } -}); - -export default ButtonSubmitOrClose; diff --git a/js/components/ascribe_buttons/button_submit_close.js b/js/components/ascribe_buttons/button_submit_close.js deleted file mode 100644 index 11d3c0a4..00000000 --- a/js/components/ascribe_buttons/button_submit_close.js +++ /dev/null @@ -1,32 +0,0 @@ -'use strict'; - -import React from 'react'; - -import AppConstants from '../../constants/application_constants'; -import { getLangText } from '../../utils/lang_utils.js' - -let ButtonSubmitOrClose = React.createClass({ - propTypes: { - submitted: React.PropTypes.bool.isRequired, - text: React.PropTypes.string.isRequired, - onClose: React.PropTypes.func.isRequired - }, - - render() { - if (this.props.submitted){ - return ( -
- -
- ); - } - return ( -
- - -
- ); - } -}); - -export default ButtonSubmitOrClose; diff --git a/sass/lib/buttons.scss b/sass/lib/buttons.scss new file mode 100644 index 00000000..e69de29b diff --git a/sass/main.scss b/sass/main.scss index 510599bd..a267c576 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -205,38 +205,22 @@ hr { border: 1px solid $ascribe-brand-danger; } } - -.btn-ascribe, -.btn-ascribe-inv { +.btn-ascribe { + background-color: #fff; border: 1px solid #444; border-radius: 0 !important; + color: #222 !important; font-family: sans-serif !important; line-height: 2em; margin-left: 0 !important; - margin-right: 1px; -} - -.btn-ascribe, -.btn-ascribe-inv:active, -.btn-ascribe-inv:hover { - background-color: #fff; - color: #222 !important; } .btn-ascribe:active, -.btn-ascribe:hover, -.btn-ascribe-inv { +.btn-ascribe:hover { background-color: #444; color: #fff !important; } -.btn-ascribe-inv:disabled, -.btn-ascribe-inv:focus { - background-color: #BBB !important; - border: 1px solid #444 !important; - color: #444 !important; -} - .btn-ascribe-sm { font-size: 12px; line-height: 1.3em;