Skip to content

Commit da8d04a

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/integration/ng15/serialize-javascript-6.0.2
2 parents 9cae594 + b9b5cd3 commit da8d04a

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/icon/icon.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import Checkmark16 from "@carbon/icons/es/checkmark/16";
2222
import CheckmarkFilled16 from "@carbon/icons/es/checkmark--filled/16";
2323
import CheckmarkFilled20 from "@carbon/icons/es/checkmark--filled/20";
2424
import CheckmarkOutline16 from "@carbon/icons/es/checkmark--outline/16";
25+
import Checkbox16 from "@carbon/icons/es/checkbox/16";
26+
import CheckboxCheckedFilled16 from "@carbon/icons/es/checkbox--checked--filled/16";
2527
import ChevronDown16 from "@carbon/icons/es/chevron--down/16";
2628
import ChevronRight16 from "@carbon/icons/es/chevron--right/16";
2729
import CircleDash16 from "@carbon/icons/es/circle-dash/16";
@@ -105,6 +107,8 @@ export class IconModule {
105107
CheckmarkFilled16,
106108
CheckmarkFilled20,
107109
CheckmarkOutline16,
110+
Checkbox16,
111+
CheckboxCheckedFilled16,
108112
ChevronDown16,
109113
ChevronRight16,
110114
CircleDash16,

src/tiles/selection-tile.component.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ import { I18n } from "carbon-components-angular/i18n";
3131
'cds--tile--disabled' : disabled
3232
}"
3333
[attr.aria-label]="i18n.get('TILES.TILE') | async">
34-
<div class="cds--tile__checkmark">
35-
<svg width="16" height="16" viewBox="0 0 16 16">
36-
<path d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zm3.646-10.854L6.75 10.043 4.354 7.646l-.708.708 3.104 3.103 5.604-5.603-.708-.708z"
37-
fill-rule="evenodd"/>
34+
<div class="cds--tile__checkmark"
35+
[class.cds--tile__checkmark--persistent]="multiple">
36+
<svg *ngIf="!selected; else selectedIcon"
37+
[cdsIcon]="multiple ? 'checkbox' : 'checkmark'"
38+
size="16">
3839
</svg>
40+
<ng-template #selectedIcon>
41+
<svg [cdsIcon]="multiple ? 'checkbox--checked--filled' : 'checkmark--filled'" size="16"></svg>
42+
</ng-template>
3943
</div>
4044
<div class="cds--tile-content">
4145
<ng-content></ng-content>

0 commit comments

Comments
 (0)