Skip to content

Commit

Permalink
Merge pull request #951 from GoOz/fix/SpinnerColor
Browse files Browse the repository at this point in the history
fix: Update Spinner default color
  • Loading branch information
GoOz authored Apr 30, 2019
2 parents 166acc9 + ea80c8d commit 2d3000b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion react/Spinner/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { translate } from '../I18n'
import cx from 'classnames'
import PropTypes from 'prop-types'
import styles from './styles.styl'
import palette from '../palette'
export const Spinner = ({
t,
loadingType,
Expand Down Expand Up @@ -60,7 +61,7 @@ Spinner.defaultProps = {
loadingType: '',
middle: false,
noMargin: false,
color: 'blue',
color: palette['primaryColor'],
size: 'medium',
className: ''
}
Expand Down
22 changes: 11 additions & 11 deletions react/__snapshots__/examples.spec.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1512,15 +1512,15 @@ exports[`Sidebar should render examples: Sidebar 1`] = `
exports[`Spinner should render examples: Spinner 1`] = `
"<div>
<div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"16\\" height=\\"16\\">
<div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"16\\" height=\\"16\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div>
</div>"
`;
exports[`Spinner should render examples: Spinner 2`] = `
"<div>
<div>blue (default): <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"16\\" height=\\"16\\">
<div>blue (default): <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"16\\" height=\\"16\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div> or <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"16\\" height=\\"16\\">
<use xlink:href=\\"#spinner\\"></use>
Expand All @@ -1538,7 +1538,7 @@ exports[`Spinner should render examples: Spinner 2`] = `
exports[`Spinner should render examples: Spinner 3`] = `
"<div>
<div>
<div class=\\"styles__c-spinner___1snK7 styles__c-spinner--nomargin___13JyW\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"16\\" height=\\"16\\">
<div class=\\"styles__c-spinner___1snK7 styles__c-spinner--nomargin___13JyW\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"16\\" height=\\"16\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div>
</div>
Expand All @@ -1547,19 +1547,19 @@ exports[`Spinner should render examples: Spinner 3`] = `
exports[`Spinner should render examples: Spinner 4`] = `
"<div>
<div>tiny: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"8\\" height=\\"8\\">
<div>tiny: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"8\\" height=\\"8\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div><br>small: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"12\\" height=\\"12\\">
</svg></div><br>small: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"12\\" height=\\"12\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div><br>medium (default): <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"16\\" height=\\"16\\">
</svg></div><br>medium (default): <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"16\\" height=\\"16\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div> or <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"16\\" height=\\"16\\">
</svg></div> or <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"16\\" height=\\"16\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div><br>large: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"24\\" height=\\"24\\">
</svg></div><br>large: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"24\\" height=\\"24\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div><br>xlarge: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"36\\" height=\\"36\\">
</svg></div><br>xlarge: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"36\\" height=\\"36\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div><br>xxlarge: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"80\\" height=\\"80\\">
</svg></div><br>xxlarge: <div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"80\\" height=\\"80\\">
<use xlink:href=\\"#spinner\\"></use>
</svg></div>
</div>
Expand All @@ -1569,7 +1569,7 @@ exports[`Spinner should render examples: Spinner 4`] = `
exports[`Spinner should render examples: Spinner 5`] = `
"<div>
<div>
<div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: blue;\\" width=\\"80\\" height=\\"80\\">
<div class=\\"styles__c-spinner___1snK7\\"><svg class=\\"styles__icon___23x3R styles__icon--spin___ybfC1\\" style=\\"fill: var(--primaryColor);\\" width=\\"80\\" height=\\"80\\">
<use xlink:href=\\"#spinner\\"></use>
</svg>
<p>loading.hi</p>
Expand Down

0 comments on commit 2d3000b

Please sign in to comment.