From de784c555c7e4add68de4015bf9c633b4a9d4e43 Mon Sep 17 00:00:00 2001 From: Anna Wen Date: Tue, 21 Jan 2020 13:39:43 -0500 Subject: [PATCH 1/2] feat(progress-indicator): update to use carbon icons --- .../progress-indicator/_progress-indicator.scss | 7 +++++-- .../ProgressIndicator/ProgressIndicator.js | 17 ++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/components/src/components/progress-indicator/_progress-indicator.scss b/packages/components/src/components/progress-indicator/_progress-indicator.scss index 12f9a5dda859..63702c1d2dd8 100644 --- a/packages/components/src/components/progress-indicator/_progress-indicator.scss +++ b/packages/components/src/components/progress-indicator/_progress-indicator.scss @@ -142,10 +142,13 @@ } .#{$prefix}--progress-step--current svg { - width: 14px; - height: 14px; + stroke: $interactive-01; fill: $interactive-01; margin-top: rem(9.5px); + + path:last-of-type { + stroke-width: 40%; + } } //INCOMPLETE STYLING diff --git a/packages/react/src/components/ProgressIndicator/ProgressIndicator.js b/packages/react/src/components/ProgressIndicator/ProgressIndicator.js index 647dffb63e10..6adc7b97e613 100644 --- a/packages/react/src/components/ProgressIndicator/ProgressIndicator.js +++ b/packages/react/src/components/ProgressIndicator/ProgressIndicator.js @@ -9,7 +9,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import classnames from 'classnames'; import { settings } from 'carbon-components'; -import { CheckmarkOutline16, Warning16 } from '@carbon/icons-react'; +import { + CheckmarkOutline16, + Warning16, + RadioButtonChecked16, + RadioButton16, +} from '@carbon/icons-react'; import { keys, matches } from '../../internal/keyboard'; const { prefix } = settings; @@ -49,10 +54,9 @@ export const ProgressStep = ({ ...props }) => { } if (current) { return ( - - + {description} - + ); } if (complete) { @@ -63,10 +67,9 @@ export const ProgressStep = ({ ...props }) => { ); } return ( - + {description} - - + ); }; From 3f658b9ad3291e60f1210ec1e46c4fa723f9fe26 Mon Sep 17 00:00:00 2001 From: Anna Wen Date: Tue, 28 Jan 2020 09:10:42 -0500 Subject: [PATCH 2/2] fix(progress-indicator): remove top margin from icon --- packages/components/docs/sass.md | 7 +++++-- .../components/progress-indicator/_progress-indicator.scss | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index fac73c714ad5..0296c74560dd 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -20464,10 +20464,13 @@ Progress indicator styles } .#{$prefix}--progress-step--current svg { - width: 14px; - height: 14px; + stroke: $interactive-01; fill: $interactive-01; margin-top: rem(9.5px); + + path:last-of-type { + stroke-width: 40%; + } } //INCOMPLETE STYLING diff --git a/packages/components/src/components/progress-indicator/_progress-indicator.scss b/packages/components/src/components/progress-indicator/_progress-indicator.scss index f3169a7b9016..7b8305024fc9 100644 --- a/packages/components/src/components/progress-indicator/_progress-indicator.scss +++ b/packages/components/src/components/progress-indicator/_progress-indicator.scss @@ -145,7 +145,6 @@ .#{$prefix}--progress-step--current svg { stroke: $interactive-01; fill: $interactive-01; - margin-top: rem(9.5px); path:last-of-type { stroke-width: 40%;