Skip to content

Commit 9a71739

Browse files
stanislavgeorgievstanislavgeorgiev
committed
Use ibmIcon
1 parent a67584b commit 9a71739

File tree

2 files changed

+8
-33
lines changed

2 files changed

+8
-33
lines changed

‎src/icon/icon.module.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import CheckmarkFilled20 from "@carbon/icons/es/checkmark--filled/20";
2424
import CheckmarkOutline16 from "@carbon/icons/es/checkmark--outline/16";
2525
import ChevronDown16 from "@carbon/icons/es/chevron--down/16";
2626
import ChevronRight16 from "@carbon/icons/es/chevron--right/16";
27+
import CircleDash16 from "@carbon/icons/es/circle-dash/16";
2728
import Close16 from "@carbon/icons/es/close/16";
2829
import Close20 from "@carbon/icons/es/close/20";
2930
import Copy16 from "@carbon/icons/es/copy/16";
@@ -38,6 +39,7 @@ import ErrorFilled16 from "@carbon/icons/es/error--filled/16";
3839
import ErrorFilled20 from "@carbon/icons/es/error--filled/20";
3940
import Fade16 from "@carbon/icons/es/fade/16";
4041
import Fade20 from "@carbon/icons/es/fade/20";
42+
import Incomplete16 from "@carbon/icons/es/incomplete/16";
4143
import InformationFilled16 from "@carbon/icons/es/information--filled/16";
4244
import InformationFilled20 from "@carbon/icons/es/information--filled/20";
4345
import Menu16 from "@carbon/icons/es/menu/16";
@@ -100,6 +102,7 @@ export class IconModule {
100102
CheckmarkOutline16,
101103
ChevronDown16,
102104
ChevronRight16,
105+
CircleDash16,
103106
Close16,
104107
Close20,
105108
Copy16,
@@ -114,6 +117,7 @@ export class IconModule {
114117
ErrorFilled20,
115118
Fade16,
116119
Fade20,
120+
Incomplete16,
117121
InformationFilled16,
118122
InformationFilled20,
119123
Menu16,

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

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -30,40 +30,11 @@ import { Step } from "./progress-indicator-step.interface";
3030
[ngClass]="{'bx--progress-step--disabled' : step.disabled}">
3131
<div class="bx--progress-step-button bx--progress-step-button--unclickable" role="button" tabindex="-1">
3232
<ng-container *ngIf="!step.state.includes('error')">
33-
<svg *ngIf="step.state.includes('complete')" focusable="false" preserveAspectRatio="xMidYMid meet"
34-
xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16" height="16" viewBox="0 0 32 32"
35-
aria-hidden="true">
36-
<path d="M14 21.414L9 16.413 10.413 15 14 18.586 21.585 11 23 12.415 14 21.414z"></path>
37-
<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>
38-
</svg>
39-
<svg *ngIf="step.state.includes('current')" focusable="false" preserveAspectRatio="xMidYMid meet"
40-
xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16" height="16" viewBox="0 0 32 32" aria-hidden="true">
41-
<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
42-
6.8593zM27.81 14l1.9677-.4128A13.8888 13.8888 0 0028.14 9.0457L26.4087 10A12.52 12.52 0 0127.81 14zM20.1836
43-
27.2354l.6836 1.8776a13.976 13.976 0 004.1821-2.4408l-1.2851-1.5315A11.9729 11.9729 0 0120.1836
44-
27.2354zM26.4087 22L28.14 23a14.14 14.14 0 001.6382-4.5872L27.81 18.0659A12.1519 12.1519 0 0126.4087 22zM16
45-
30V2a14 14 0 000 28z">
46-
</path>
47-
</svg>
48-
<svg *ngIf="step.state.includes('incomplete')" focusable="false"
49-
preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16" height="16"
50-
viewBox="0 0 32 32" aria-hidden="true">
51-
<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
52-
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
53-
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
54-
2.7zM24.2 27.3a15.18 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
55-
16H28A11.48 11.48 0 0127.4 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
56-
14.4 0 00-3.9-2l-.6 1.9a12.89 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
57-
29.3z"></path>
58-
</svg>
33+
<svg ibmIcon="checkmark--outline" size="16" *ngIf="step.state.includes('complete')"></svg>
34+
<svg ibmIcon="incomplete" size="16" *ngIf="step.state.includes('current')"></svg>
35+
<svg ibmIcon="circle-dash" size="16" *ngIf="step.state.includes('incomplete')"></svg>
5936
</ng-container>
60-
<svg *ngIf="step.state.includes('error')" class="bx--progress__warning" focusable="false"
61-
preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16" height="16"
62-
viewBox="0 0 16 16" aria-hidden="true">
63-
<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,
64-
8,14z"></path>
65-
<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>
66-
</svg>
37+
<svg ibmIcon="warning" size="16" *ngIf="step.state.includes('error')" class="bx--progress__warning"></svg>
6738
<p
6839
class="bx--progress-label"
6940
*ngIf="step.tooltip"

0 commit comments

Comments
 (0)