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

fix(progressindicator): adjust styles for progress step with optional label position #5356

Merged
merged 8 commits into from
Feb 17, 2020
Merged

fix(progressindicator): adjust styles for progress step with optional label position #5356

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0acf4bf
fix(progressindicator): adjust progressstep with optional label position
abbeyhrt Feb 14, 2020
365aa6c
Merge branch 'master' into progress-indicator-vertical
abbeyhrt Feb 14, 2020
2905bd9
fix(progress-indicator): adjust padding and progress line position
abbeyhrt Feb 14, 2020
07ca8e8
Merge branch 'progress-indicator-vertical' of https://github.com/abbe…
abbeyhrt Feb 14, 2020
898f410
fix(progress-indicator): update color tokens for icons and text
abbeyhrt Feb 14, 2020
1a7a9b9
Merge branch 'master' into progress-indicator-vertical
abbeyhrt Feb 14, 2020
6ae30c0
Merge branch 'master' into progress-indicator-vertical
tw15egan Feb 17, 2020
ca8afd0
Merge branch 'master' into progress-indicator-vertical
abbeyhrt Feb 17, 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
11 changes: 4 additions & 7 deletions packages/components/docs/sass.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
20 changes: 9 additions & 11 deletions packages/components/src/components/progress-indicator/_progress-indicator.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -131,7 +132,7 @@
left: 0;
margin-left: $carbon--spacing-06;
margin-top: rem(28px);
color: $text-01;
color: $text-02;
text-align: start;
}

Expand All @@ -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%;
Expand Down Expand Up @@ -225,12 +226,11 @@
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,
Expand Down Expand Up @@ -270,12 +270,10 @@

.#{$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;
Expand Down