Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(InlineLoading): change error icon to filled #5018

Merged
merged 5 commits into from
Jan 14, 2020
Merged

fix(InlineLoading): change error icon to filled #5018

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b427bdb
fix(InlineLoading): change error icon to filled
janhassel Jan 13, 2020
8d1962f
Merge branch 'master' into inlineloading-icon-update
tw15egan Jan 13, 2020
0d763b3
Merge branch 'master' into inlineloading-icon-update
tw15egan Jan 13, 2020
0a72df0
Merge branch 'master' into inlineloading-icon-update
joshblack Jan 13, 2020
aaed1b6
Merge branch 'master' into inlineloading-icon-update
emyarod Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/react/src/components/InlineLoading/InlineLoading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { CheckmarkFilled16, Error20 } from '@carbon/icons-react';
import { CheckmarkFilled16, ErrorFilled16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';
import deprecate from '../../prop-types/deprecate';
import Loading from '../Loading';
Expand All @@ -28,7 +28,7 @@ export default function InlineLoading({
const loadingClasses = classNames(`${prefix}--inline-loading`, className);
const getLoading = () => {
if (status === 'error') {
return <Error20 className={`${prefix}--inline-loading--error`} />;
return <ErrorFilled16 className={`${prefix}--inline-loading--error`} />;
}
if (status === 'finished') {
setTimeout(() => {
Expand Down