diff --git a/components/progress_bar/index.jsx b/components/progress_bar/index.jsx index 49bc14cc..67308c26 100644 --- a/components/progress_bar/index.jsx +++ b/components/progress_bar/index.jsx @@ -1,7 +1,7 @@ /* global React */ import { addons } from 'react/addons'; -import css from './style'; +import style from './style'; import prefixer from '../utils/prefixer'; export default React.createClass({ @@ -45,8 +45,8 @@ export default React.createClass({ renderCircular () { return ( - - + + ); }, @@ -66,17 +66,17 @@ export default React.createClass({ const {buffer, value} = this.linearStyle(); return (
- - + +
); }, render () { - let className = this.props.type === 'linear' ? css.linearBar : css.circularBar; + let className = this.props.type === 'linear' ? style.linear : style.circular; + if (this.props.mode) className += ` ${style[this.props.mode]}`; + if (this.props.multicolor) className += ` ${style.multicolor}`; if (this.props.className) className += ` ${this.props.className}`; - if (this.props.mode) className += ` ${this.props.mode}`; - if (this.props.multicolor) className += ` multicolor`; return (