Skip to content

Commit 70b6410

Browse files
fix(progress-indicator): Match style with Carbon design
1 parent 968ed34 commit 70b6410

File tree

1 file changed

+29
-9
lines changed

1 file changed

+29
-9
lines changed

src/progress-indicator/progress-indicator.component.ts

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,36 @@ import { Step } from "./progress-indicator-step.interface";
2929
*ngFor="let step of steps; let i = index"
3030
[ngClass]="{'bx--progress-step--disabled' : step.disabled}">
3131
<div class="bx--progress-step-button bx--progress-step-button--unclickable" role="button" tabindex="-1">
32-
<svg ibmIcon="checkmark--outline" size="16" *ngIf="step.state.includes('complete')"></svg>
33-
<svg *ngIf="step.state.includes('current')">
34-
<path d="M 7, 7 m -7, 0 a 7,7 0 1,0 14,0 a 7,7 0 1,0 -14,0" ></path>
32+
<svg *ngIf="step.state.includes('complete')" focusable="false" preserveAspectRatio="xMidYMid meet"
33+
xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16" height="16" viewBox="0 0 32 32" aria-hidden="true">
34+
<path d="M14 21.414L9 16.413 10.413 15 14 18.586 21.585 11 23 12.415 14 21.414z"></path>
35+
<path d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"></path>
3536
</svg>
36-
<svg *ngIf="step.state.includes('incomplete')">
37-
<path
38-
d="M8 1C4.1 1 1 4.1 1 8s3.1 7 7 7 7-3.1 7-7-3.1-7-7-7zm0 13c-3.3 0-6-2.7-6-6s2.7-6 6-6 6 2.7 6 6-2.7 6-6 6z">
37+
<svg *ngIf="step.state.includes('current')" focusable="false" preserveAspectRatio="xMidYMid meet"
38+
xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16" height="16" viewBox="0 0 32 32" aria-hidden="true">
39+
<path d="M23.7642 6.8593l1.2851-1.5315A13.976 13.976 0 0020.8672 2.887l-.6836 1.8776A11.9729 11.9729 0 0123.7642
40+
6.8593zM27.81 14l1.9677-.4128A13.8888 13.8888 0 0028.14 9.0457L26.4087 10A12.52 12.52 0 0127.81 14zM20.1836
41+
27.2354l.6836 1.8776a13.976 13.976 0 004.1821-2.4408l-1.2851-1.5315A11.9729 11.9729 0 0120.1836 27.2354zM26.4087
42+
22L28.14 23a14.14 14.14 0 001.6382-4.5872L27.81 18.0659A12.1519 12.1519 0 0126.4087 22zM16 30V2a14 14 0 000 28z">
3943
</path>
4044
</svg>
41-
<svg ibmIcon="warning" size="16" *ngIf="step.state.includes('error')" class="bx--progress__warning"></svg>
45+
<svg *ngIf="step.state.includes('incomplete') && !step.state.includes('error')" focusable="false"
46+
preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16" height="16"
47+
viewBox="0 0 32 32" aria-hidden="true">
48+
<path d="M7.7 4.7a14.7 14.7 0 00-3 3.1L6.3 9A13.26 13.26 0 018.9 6.3zM4.6 12.3l-1.9-.6A12.51 12.51 0 002 16H4A11.48
49+
11.48 0 014.6 12.3zM2.7 20.4a14.4 14.4 0 002 3.9l1.6-1.2a12.89 12.89 0 01-1.7-3.3zM7.8 27.3a14.4 14.4 0 003.9
50+
2l.6-1.9A12.89 12.89 0 019 25.7zM11.7 2.7l.6 1.9A11.48 11.48 0 0116 4V2A12.51 12.51 0 0011.7 2.7zM24.2 27.3a15.18
51+
15.18 0 003.1-3.1L25.7 23A11.53 11.53 0 0123 25.7zM27.4 19.7l1.9.6A15.47 15.47 0 0030 16H28A11.48 11.48 0 0127.4
52+
19.7zM29.2 11.6a14.4 14.4 0 00-2-3.9L25.6 8.9a12.89 12.89 0 011.7 3.3zM24.1 4.6a14.4 14.4 0 00-3.9-2l-.6 1.9a12.89
53+
12.89 0 013.3 1.7zM20.3 29.3l-.6-1.9A11.48 11.48 0 0116 28v2A21.42 21.42 0 0020.3 29.3z"></path>
54+
</svg>
55+
<svg *ngIf="step.state.includes('error')" class="bx--progress__warning" focusable="false"
56+
preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16" height="16"
57+
viewBox="0 0 16 16" aria-hidden="true">
58+
<path d="M8,1C4.1,1,1,4.1,1,8s3.1,7,7,7s7-3.1,7-7S11.9,1,8,1z M8,14c-3.3,0-6-2.7-6-6s2.7-6,6-6s6,2.7,6,6S11.3,14,
59+
8,14z"></path>
60+
<path d="M7.5 4H8.5V9H7.5zM8 10.2c-.4 0-.8.3-.8.8s.3.8.8.8c.4 0 .8-.3.8-.8S8.4 10.2 8 10.2z"></path>
61+
</svg>
4262
<p
4363
class="bx--progress-label"
4464
*ngIf="step.tooltip"
@@ -64,7 +84,7 @@ export class ProgressIndicator implements OnChanges {
6484
static skeletonSteps(stepCount: number) {
6585
const steps = [];
6686
for (let i = 0; i < stepCount; i++) {
67-
steps.push({"state": ["incomplete"]});
87+
steps.push({ "state": ["incomplete"] });
6888
}
6989

7090
return steps;
@@ -85,7 +105,7 @@ export class ProgressIndicator implements OnChanges {
85105
}
86106
private _current: number;
87107

88-
constructor(protected experimental: ExperimentalService) {}
108+
constructor(protected experimental: ExperimentalService) { }
89109

90110
ngOnChanges(changes: SimpleChanges) {
91111
if (changes.steps || changes.current) {

0 commit comments

Comments
 (0)