card / update dropdown

This commit is contained in:
oconnorct1 2017-05-07 02:17:31 -04:00
parent 34bdf61cf0
commit 43629d0fd4
4 changed files with 16 additions and 5 deletions

View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Link } from 'react-router'; import { Link } from 'react-router';
import { Card } from 'material-ui/Card'; import { Card } from 'semantic-ui-react';
import { nodeOrStringProptype } from '~/util/proptypes'; import { nodeOrStringProptype } from '~/util/proptypes';
@ -58,6 +58,7 @@ export default class Container extends Component {
} }
onClick={ onClick } onClick={ onClick }
onFocus={ onFocus } onFocus={ onFocus }
fluid
> >
{ this.renderTitle() } { this.renderTitle() }
{ children } { children }

View File

@ -14,3 +14,8 @@
/* You should have received a copy of the GNU General Public License /* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>. /* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/ */
.dropdown {
position: relative;
display: block;
}

View File

@ -31,14 +31,18 @@
import React, { PropTypes } from 'react'; import React, { PropTypes } from 'react';
import { Dropdown as DropdownUI } from 'semantic-ui-react'; import { Dropdown as DropdownUI } from 'semantic-ui-react';
export default function Dropdown ({ defaultValue, disabled, fluid, icon, name, onChange, onClick, onClose, onFocus, options, placeholder, scrolling, search, selection, text, value }) { import styles from './dropdown.css';
export default function Dropdown ({ defaultValue, disabled, fluid, icon, name, onBlur, onChange, onClick, onClose, onFocus, options, placeholder, scrolling, search, selection, text, value }) {
return ( return (
<DropdownUI <DropdownUI
className={ styles.dropdown }
defaultValue={ defaultValue } defaultValue={ defaultValue }
disabled={ disabled } disabled={ disabled }
fluid={ fluid } fluid={ fluid }
icon={ icon } icon={ icon }
name={ name } name={ name }
onBlur={ onBlur }
onChange={ onChange } onChange={ onChange }
onClick={ onClick } onClick={ onClick }
onClose={ onClose } onClose={ onClose }
@ -55,11 +59,12 @@ export default function Dropdown ({ defaultValue, disabled, fluid, icon, name, o
} }
Dropdown.propTypes = { Dropdown.propTypes = {
defaultValue: PropTypes.number, // Initial value via index defaultValue: PropTypes.number, // Initial value via index.
disabled: PropTypes.bool, // A disabled dropdown menu or item does not allow user interaction. disabled: PropTypes.bool, // A disabled dropdown menu or item does not allow user interaction.
fluid: PropTypes.bool, // A dropdown can take the full width of its parent fluid: PropTypes.bool, // A dropdown can take the full width of its parent.
icon: PropTypes.any, // Shorthand for Icon. icon: PropTypes.any, // Shorthand for Icon.
name: PropTypes.func, // Name of the hidden input which holds the value. name: PropTypes.func, // Name of the hidden input which holds the value.
onBlur: PropTypes.func, // Called on blur.
onChange: PropTypes.func, // Called when the user attempts to change the value. onChange: PropTypes.func, // Called when the user attempts to change the value.
onClick: PropTypes.func, // Called on click. onClick: PropTypes.func, // Called on click.
onClose: PropTypes.func, // Called on close. onClose: PropTypes.func, // Called on close.

View File

@ -59,7 +59,7 @@ export default class OptionsStep extends Component {
return ( return (
<div className={ styles.body }> <div className={ styles.body }>
<Form> <Form>
<div style={ { display: 'block', height: '22px', fontSize: '16px', position: 'relative', lineHeight: '22px', top: '38px', pointerEvents: 'none', userSelect: 'none', color: 'rgba(0, 0, 0, 0.298039)' } }> <div style={ { display: 'block', paddingTop: '15px', paddingBottom: '5px', fontSize: '16px', pointerEvents: 'none', userSelect: 'none', color: 'rgba(0, 0, 0, 0.298039)' } }>
<FormattedMessage <FormattedMessage
id='shapeshift.optionsStep.typeSelect.label' id='shapeshift.optionsStep.typeSelect.label'
defaultMessage='Fund account from' defaultMessage='Fund account from'