From 0acf4bf860b031295cd6068394a26c54205c4645 Mon Sep 17 00:00:00 2001 From: Abbey Hart Date: Fri, 14 Feb 2020 10:37:18 -0600 Subject: [PATCH 1/3] fix(progressindicator): adjust progressstep with optional label position --- .../components/progress-indicator/_progress-indicator.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/components/src/components/progress-indicator/_progress-indicator.scss b/packages/components/src/components/progress-indicator/_progress-indicator.scss index 7b8305024fc9..4459708a81f2 100644 --- a/packages/components/src/components/progress-indicator/_progress-indicator.scss +++ b/packages/components/src/components/progress-indicator/_progress-indicator.scss @@ -225,8 +225,11 @@ width: rem(40px); } + // Vertical Variant + .#{$prefix}--progress--vertical { - display: block; + display: flex; + flex-direction: column; } .#{$prefix}--progress--vertical .#{$prefix}--progress-step { @@ -270,7 +273,6 @@ .#{$prefix}--progress--vertical .#{$prefix}--progress-optional { margin-top: auto; - position: initial; margin-left: 2.25rem; } From 2905bd9b81abc9bff266594514dba9425458ef53 Mon Sep 17 00:00:00 2001 From: Abbey Hart Date: Fri, 14 Feb 2020 11:50:16 -0600 Subject: [PATCH 2/3] fix(progress-indicator): adjust padding and progress line position --- .../components/progress-indicator/_progress-indicator.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/components/src/components/progress-indicator/_progress-indicator.scss b/packages/components/src/components/progress-indicator/_progress-indicator.scss index 4459708a81f2..a97544eb877e 100644 --- a/packages/components/src/components/progress-indicator/_progress-indicator.scss +++ b/packages/components/src/components/progress-indicator/_progress-indicator.scss @@ -232,10 +232,6 @@ flex-direction: column; } - .#{$prefix}--progress--vertical .#{$prefix}--progress-step { - padding-bottom: rem(24px); - } - .#{$prefix}--progress--vertical .#{$prefix}--progress-step, .#{$prefix}--progress--vertical .#{$prefix}--progress-step-button { display: list-item; @@ -277,7 +273,6 @@ } .#{$prefix}--progress--vertical .#{$prefix}--progress-line { - top: 0; left: 0; height: 100%; width: 1px; From 898f410839c33b015957ff2edfdcbafa59cb2226 Mon Sep 17 00:00:00 2001 From: Abbey Hart Date: Fri, 14 Feb 2020 13:11:55 -0600 Subject: [PATCH 3/3] fix(progress-indicator): update color tokens for icons and text --- packages/components/docs/sass.md | 11 ++++------- .../progress-indicator/_progress-indicator.scss | 9 +++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index 70f16a48dede..383e1115cdb6 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -20611,12 +20611,11 @@ Progress indicator styles width: rem(40px); } - .#{$prefix}--progress--vertical { - display: block; - } + // Vertical Variant - .#{$prefix}--progress--vertical .#{$prefix}--progress-step { - padding-bottom: rem(24px); + .#{$prefix}--progress--vertical { + display: flex; + flex-direction: column; } .#{$prefix}--progress--vertical .#{$prefix}--progress-step, @@ -20656,12 +20655,10 @@ Progress indicator styles .#{$prefix}--progress--vertical .#{$prefix}--progress-optional { margin-top: auto; - position: initial; margin-left: 2.25rem; } .#{$prefix}--progress--vertical .#{$prefix}--progress-line { - top: 0; left: 0; height: 100%; width: 1px; diff --git a/packages/components/src/components/progress-indicator/_progress-indicator.scss b/packages/components/src/components/progress-indicator/_progress-indicator.scss index a97544eb877e..58f152d6847e 100644 --- a/packages/components/src/components/progress-indicator/_progress-indicator.scss +++ b/packages/components/src/components/progress-indicator/_progress-indicator.scss @@ -49,11 +49,12 @@ height: $carbon--spacing-05; border-radius: 50%; margin: 9px $carbon--spacing-03 0 0; - fill: $interactive-01; + fill: $interactive-04; } .#{$prefix}--progress-label { @include type-style('body-short-01'); + color: $text-01; line-height: 1.45; max-width: rem(88px); margin: $carbon--spacing-03 0 0 0; @@ -131,7 +132,7 @@ left: 0; margin-left: $carbon--spacing-06; margin-top: rem(28px); - color: $text-01; + color: $text-02; text-align: start; } @@ -143,8 +144,8 @@ } .#{$prefix}--progress-step--current svg { - stroke: $interactive-01; - fill: $interactive-01; + stroke: $interactive-04; + fill: $interactive-04; path:last-of-type { stroke-width: 40%;