Some small updates coming from IVIS
This commit is contained in:
parent
4943b22a51
commit
e85c707973
14 changed files with 4319 additions and 2975 deletions
22
client/src/lib/bootstrap-components.js
vendored
22
client/src/lib/bootstrap-components.js
vendored
|
@ -97,7 +97,8 @@ class Button extends Component {
|
|||
|
||||
class DropdownMenu extends Component {
|
||||
static propTypes = {
|
||||
label: PropTypes.string,
|
||||
label: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
|
||||
noCaret: PropTypes.bool,
|
||||
className: PropTypes.string
|
||||
}
|
||||
|
||||
|
@ -109,10 +110,17 @@ class DropdownMenu extends Component {
|
|||
className = className + ' ' + props.className;
|
||||
}
|
||||
|
||||
let label;
|
||||
if (this.props.noCaret) {
|
||||
label = props.label;
|
||||
} else {
|
||||
label = <span>{props.label}{' '}<span className="caret"></span></span>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="btn-group">
|
||||
<button type="button" className={className} data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
{props.label}{' '}<span className="caret"></span>
|
||||
{label}
|
||||
</button>
|
||||
<ul className="dropdown-menu">
|
||||
{props.children}
|
||||
|
@ -140,7 +148,15 @@ class DropdownMenuItem extends Component {
|
|||
|
||||
return (
|
||||
<li className={className}>
|
||||
<a href="#" className="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{props.icon && <Icon icon={props.icon}/>}{props.label}{' '}<span className="caret"></span></a>
|
||||
{props.icon ?
|
||||
<a href="#" className="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
<Icon icon={props.icon}/>{' '}{props.label}{' '}<span className="caret"></span>
|
||||
</a>
|
||||
:
|
||||
<a href="#" className="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
{props.label}{' '}<span className="caret"></span>
|
||||
</a>
|
||||
}
|
||||
<ul className="dropdown-menu">
|
||||
{props.children}
|
||||
</ul>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue