1
0
mirror of https://github.com/ascribe/onion.git synced 2025-01-08 20:55:59 +01:00

Fix ListItemEditionWidget spinner's colour

This commit is contained in:
Brett Sun 2015-12-04 14:34:59 +01:00
parent 9d02877363
commit 5a6026d0ca
4 changed files with 21 additions and 12 deletions

View File

@ -78,7 +78,6 @@ let AccordionListItemEditionWidget = React.createClass({
return ( return (
<AscribeSpinner <AscribeSpinner
size='sm' size='sm'
color='white'
classNames='pull-right margin-left-2px'/> classNames='pull-right margin-left-2px'/>
); );
} else { } else {

View File

@ -7,26 +7,26 @@ let AscribeSpinner = React.createClass({
propTypes: { propTypes: {
classNames: React.PropTypes.string, classNames: React.PropTypes.string,
size: React.PropTypes.oneOf(['sm', 'md', 'lg']), size: React.PropTypes.oneOf(['sm', 'md', 'lg']),
color: React.PropTypes.oneOf(['blue', 'dark-blue', 'light-blue', 'pink', 'black', 'loop']) color: React.PropTypes.oneOf(['black', 'blue', 'dark-blue', 'light-blue', 'pink', 'white', 'loop'])
}, },
getDefaultProps() { getDefaultProps() {
return { return {
inline: false, inline: false,
size: 'md', size: 'md'
color: 'loop'
}; };
}, },
render() { render() {
const { classNames: classes, color, size } = this.props;
return ( return (
<div <div
className={ className={classNames('spinner-wrapper-' + size,
classNames('spinner-wrapper-' + this.props.size, color ? 'spinner-wrapper-' + color : null,
'spinner-wrapper-' + this.props.color, classes)}>
this.props.classNames)}> <div className='spinner-circle' />
<div className={classNames('spinner-circle')}></div> <div className='spinner-inner'>A</div>
<div className={classNames('spinner-inner')}>A</div>
</div> </div>
); );
} }

View File

@ -52,6 +52,13 @@ $ascribe--spinner-size-sm: 15px;
} }
} }
.spinner-wrapper-white {
color: $ascribe-white;
.spinner-circle {
border-color: $ascribe-white;
}
}
.spinner-wrapper-lg { .spinner-wrapper-lg {
width: $ascribe--spinner-size-lg; width: $ascribe--spinner-size-lg;
height: $ascribe--spinner-size-lg; height: $ascribe--spinner-size-lg;

View File

@ -331,6 +331,9 @@ $vivi23--highlight-color: #de2600;
.spinner-inner { .spinner-inner {
display: none; display: none;
} }
.btn-secondary .spinner-circle {
border-color: $vivi23--bg-color;
}
// video player // video player
.ascribe-media-player .vjs-default-skin { .ascribe-media-player .vjs-default-skin {