Skip to content

Commit bd570bd

Browse files
committed
Merge branch 'main' into copy-to-clipboard
2 parents 7b77a2c + 1437a9e commit bd570bd

33 files changed

+603
-68
lines changed

package-lock.json

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"iso8601-duration": "^1.3.0",
6363
"lodash-es": "^4.17.21",
6464
"rxjs": "~6.6.7",
65-
"tslib": "^2.2.0",
65+
"tslib": "^2.3.0",
6666
"uuid": "^8.3.2",
6767
"zone.js": "^0.11.4"
6868
},
@@ -85,7 +85,7 @@
8585
"@types/d3-quadtree": "^1.0.7",
8686
"@types/d3-scale": "^2.1.1",
8787
"@types/d3-selection": "^1.4.2",
88-
"@types/d3-shape": "^1.3.1",
88+
"@types/d3-shape": "^2.1.0",
8989
"@types/d3-zoom": "^1.7.5",
9090
"@types/jest": "^26.0.23",
9191
"@types/lodash-es": "^4.17.4",
Lines changed: 3 additions & 0 deletions
Loading

projects/assets-library/src/icons/icon-library.module.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const iconsRootPath = 'assets/icons';
2525
{ key: IconType.ArrowUpLeft, url: `${iconsRootPath}/arrow-up-left.svg` },
2626
{ key: IconType.ArrowUpRight, url: `${iconsRootPath}/arrow-up-right.svg` },
2727
{ key: IconType.CheckCircle, url: `${iconsRootPath}/check-circle.svg` },
28+
{ key: IconType.CheckCircleFill, url: `${iconsRootPath}/check-circle-fill.svg` },
2829
{ key: IconType.ChevronDown, url: `${iconsRootPath}/chevron-down.svg` },
2930
{ key: IconType.ChevronLeft, url: `${iconsRootPath}/chevron-left.svg` },
3031
{ key: IconType.ChevronRight, url: `${iconsRootPath}/chevron-right.svg` },

projects/assets-library/src/icons/icon-type.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export const enum IconType {
1616
ArrowUpRight = 'svg:arrow-up-right',
1717
Cancel = 'cancel',
1818
CheckCircle = 'svg:check-circle',
19+
CheckCircleFill = 'svg:check-circle-fill',
1920
Checkmark = 'checkmark',
2021
ChevronDown = 'svg:chevron-down',
2122
ChevronLeft = 'svg:chevron-left',

projects/components/src/checkbox/checkbox.component.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:host {
44
::ng-deep .mat-checkbox-checked .mat-checkbox-background,
55
.mat-checkbox-indeterminate {
6-
background-color: $blue-5;
6+
background-color: $blue-4;
77
}
88

99
::ng-deep .mat-checkbox-disabled {
@@ -13,13 +13,14 @@
1313

1414
&.mat-checkbox-checked .mat-checkbox-background,
1515
.mat-checkbox-indeterminate {
16+
background-color: $gray-5;
1617
opacity: 0.4;
1718
cursor: not-allowed;
1819
}
1920
}
2021

2122
::ng-deep .mat-checkbox:not(.mat-checkbox-disabled) .mat-checkbox-ripple .mat-ripple-element {
22-
background-color: $blue-5;
23+
background-color: $blue-4;
2324
}
2425
}
2526

projects/components/src/checkbox/checkbox.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { MatCheckboxChange } from '@angular/material/checkbox';
1212
[disabled]="this.disabled"
1313
(change)="onCheckboxChange($event)"
1414
class="ht-checkbox"
15+
[ngClass]="{ disabled: this.disabled }"
1516
>
1617
<ht-label class="label" *ngIf="this.label !== undefined && this.label !== ''" [label]="this.label"></ht-label>
1718
</mat-checkbox>

projects/components/src/header/page/page-header.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ import { NavigableTab } from '../../tabs/navigable/navigable-tab';
3535
<ng-content></ng-content>
3636
3737
<ht-navigable-tab-group *ngIf="this.tabs?.length" class="tabs">
38-
<ht-navigable-tab *ngFor="let tab of this.tabs" [path]="tab.path" [hidden]="tab.hidden">
38+
<ht-navigable-tab
39+
*ngFor="let tab of this.tabs"
40+
[path]="tab.path"
41+
[hidden]="tab.hidden"
42+
[features]="tab.features"
43+
>
3944
{{ tab.label }}
4045
</ht-navigable-tab>
4146
</ht-navigable-tab-group>

projects/components/src/icon/icon-size.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export const enum IconSize {
44
Medium = 'medium',
55
Large = 'large',
66
ExtraLarge = 'extra-large',
7+
ExtraLarger = 'extra-larger',
78
Hodor = 'hodor',
89
Inherit = 'inherit'
910
}

projects/components/src/icon/icon.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
width: 32px;
3636
}
3737

38+
&.extra-larger {
39+
font-size: 48px;
40+
height: 48px;
41+
width: 48px;
42+
}
43+
3844
&.hodor {
3945
font-size: 64px;
4046
height: 64px;

0 commit comments

Comments
 (0)