Skip to content

Commit 5dae146

Browse files
committed
feat: update angular version
1 parent 8d828db commit 5dae146

File tree

24 files changed

+600
-1719
lines changed

24 files changed

+600
-1719
lines changed

build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function buildAll() {
1818
.reduce((err, exec) => {
1919
try {
2020
console.log(`Building ${exec.project} (${exec.config}):`);
21-
child.execSync(`ng build --prod --project ${exec.project} --configuration ${exec.config}`, { stdio: "inherit" });
21+
child.execSync(`ng build --project ${exec.project} --configuration ${exec.config}`, { stdio: "inherit" });
2222
}
2323
catch (error) {
2424
err.push({
@@ -42,4 +42,4 @@ function buildAll() {
4242
}
4343
}
4444

45-
buildAll();
45+
buildAll();

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
"private": false,
1919
"dependencies": {
2020
"@angular/animations": "^12.1.1",
21-
"@angular/cdk": "^11.0.3",
21+
"@angular/cdk": "^12.1.1",
2222
"@angular/common": "^12.1.1",
2323
"@angular/compiler": "^12.1.1",
2424
"@angular/core": "^12.1.1",
2525
"@angular/forms": "^12.1.1",
26-
"@angular/material": "^11.0.3",
26+
"@angular/material": "^12.1.1",
2727
"@angular/platform-browser": "^12.1.1",
2828
"@angular/platform-browser-dynamic": "^12.1.1",
2929
"@angular/router": "^12.1.1",
30-
"@ngrx/store": "^10.1.2",
30+
"@ngrx/store": "^12.2.0",
3131
"@ngx-translate/core": "^13.0.0",
3232
"perfect-scrollbar": "^1.5.0",
3333
"rxjs": "~6.6.3",

projects/craftsjs/alert/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Choose the version corresponding to your Angular version:
1313

1414
| Angular | @craftsjs/alert |
1515
| ------- | --------------- |
16+
| 12 | 3.x |
1617
| 11 | 2.x |
1718
| 10 | 1.x |
1819

projects/craftsjs/alert/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"license": "MIT",
77
"homepage": "https://github.com/addapptables/angular-miscellaneous",
88
"peerDependencies": {
9-
"@angular/common": ">= 11.0.0 < 12.0.0",
10-
"@angular/core": ">= 11.0.0 < 12.0.0",
11-
"@angular/material": ">= 11.0.0 < 12.0.0",
12-
"@angular/cdk": ">= 11.0.0 < 12.0.0",
13-
"@angular/animations": ">= 11.0.0 < 12.0.0",
14-
"@ngx-translate/core": ">= 13.0.0 < 14.0.0",
15-
"@craftsjs/core": ">=2.0.0 < 3.0.0"
9+
"@angular/common": ">= 12.0.0 < 13.0.0",
10+
"@angular/core": ">= 12.0.0 < 13.0.0",
11+
"@angular/material": ">= 12.0.0 < 13.0.0",
12+
"@angular/cdk": ">= 12.0.0 < 13.0.0",
13+
"@angular/animations": ">= 12.0.0 < 13.0.0",
14+
"@ngx-translate/core": ">= 13.0.0 < 16.0.0",
15+
"@craftsjs/core": ">=3.0.0 < 4.0.0"
1616
},
1717
"repository": {
1818
"type": "git",

projects/craftsjs/card/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Choose the version corresponding to your Angular version:
1313

1414
Angular | @craftsjs/card
1515
----------- | -------------------
16+
12 | 3.x
1617
11 | 2.x
1718
10 | 1.x
1819

projects/craftsjs/card/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"license": "MIT",
77
"homepage": "https://github.com/addapptables/angular-miscellaneous",
88
"peerDependencies": {
9-
"@angular/common": ">= 11.0.0 < 12.0.0",
10-
"@angular/core": ">= 11.0.0 < 12.0.0",
11-
"@angular/animations": ">= 11.0.0 < 12.0.0",
12-
"@angular/material": ">= 11.0.0 < 12.0.0",
13-
"@angular/cdk": ">= 11.0.0 < 12.0.0"
9+
"@angular/common": ">= 12.0.0 < 13.0.0",
10+
"@angular/core": ">= 12.0.0 < 13.0.0",
11+
"@angular/animations": ">= 12.0.0 < 13.0.0",
12+
"@angular/material": ">= 12.0.0 < 13.0.0",
13+
"@angular/cdk": ">= 12.0.0 < 13.0.0"
1414
},
1515
"repository": {
1616
"type": "git",

projects/craftsjs/card/src/lib/_craftsjs-card.theme.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use '~@angular/material' as mat;
12
@import './components/card-header/craftsjs-card-header.theme';
23

34
@mixin card($theme, $variables) {
@@ -17,9 +18,9 @@
1718
$card-header-margin: -20px 15px 0 16px;
1819
$card-header-padding: 20px;
1920
$card-title-font-weight: 500;
20-
$card-header-box-shadow: 0 4px 20px 0 rgba(0,0,0,.14), 0 7px 10px -5px mat-color($accent);
21+
$card-header-box-shadow: 0 4px 20px 0 rgba(0,0,0,.14), 0 7px 10px -5px mat.get-color-from-palette($accent);
2122
$card-header-icon-margin-right: 10px;
22-
$background-color-header: mat-color($accent);
23+
$background-color-header: mat.get-color-from-palette($accent);
2324

2425
// body
2526
$card-body-padding: 12px 20px 20px;
@@ -35,7 +36,7 @@
3536
width: 100%;
3637
margin: $card-padding;
3738
box-shadow: $card-box-shadow;
38-
background: mat-color($background, card);
39+
background: mat.get-color-from-palette($background, card);
3940
margin-top: 32px;
4041
&-header {
4142
&-oval {
@@ -73,7 +74,7 @@
7374
&-footer {
7475
margin: $card-footer-margin;
7576
padding-top: $card-padding-top;
76-
border-top: 1px solid mat-color($foreground, divider);
77+
border-top: 1px solid mat.get-color-from-palette($foreground, divider);
7778
}
7879
&-divider {
7980
display: block;
@@ -85,4 +86,4 @@
8586
}
8687
}
8788
@include addapptable-card-header($variables);
88-
}
89+
}

projects/craftsjs/core/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Choose the version corresponding to your Angular version:
99

1010
Angular | @addapptables/core
1111
----------- | -------------------
12+
12 | 3.x
1213
11 | 2.x
1314
10 | 1.x
1415

projects/craftsjs/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"license": "MIT",
77
"homepage": "https://github.com/addapptables/angular-miscellaneous",
88
"peerDependencies": {
9-
"@angular/common": ">= 11.0.0 < 12.0.0",
10-
"@angular/core": ">= 11.0.0 < 12.0.0"
9+
"@angular/common": ">= 12.0.0 < 13.0.0",
10+
"@angular/core": ">= 12.0.0 < 13.0.0"
1111
},
1212
"repository": {
1313
"type": "git",

projects/craftsjs/core/src/lib/styles/grid/_variables.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ $h4-font-size: $font-size-base * 1.5 !default;
300300
$h5-font-size: $font-size-base * 1.25 !default;
301301
$h6-font-size: $font-size-base !default;
302302

303-
$headings-margin-bottom: $spacer / 2 !default;
303+
$headings-margin-bottom: math.div($spacer, 2) !default;
304304
$headings-font-family: inherit !default;
305305
$headings-font-weight: 500 !default;
306306
$headings-line-height: 1.2 !default;
@@ -556,7 +556,7 @@ $custom-radio-indicator-border-radius: 50% !default;
556556
$custom-radio-indicator-icon-checked: str-replace(url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3e%3c/svg%3e"), "#", "%23") !default;
557557

558558
$custom-switch-width: $custom-control-indicator-size * 1.75 !default;
559-
$custom-switch-indicator-border-radius: $custom-control-indicator-size / 2 !default;
559+
$custom-switch-indicator-border-radius: math.div($custom-control-indicator-size, 2) !default;
560560
$custom-switch-indicator-size: calc(#{$custom-control-indicator-size} - #{$custom-control-indicator-border-width * 4}) !default;
561561

562562
$custom-select-padding-y: $input-btn-padding-y !default;
@@ -574,9 +574,9 @@ $custom-select-indicator-color: $gray-800 !default;
574574
$custom-select-indicator: str-replace(url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e"), "#", "%23") !default;
575575
$custom-select-background: $custom-select-indicator no-repeat right $custom-select-padding-x center / $custom-select-bg-size !default; // Used so we can have multiple background elements (e.g., arrow and feedback icon)
576576

577-
$custom-select-feedback-icon-padding-right: $input-height-inner * 3 / 4 + $custom-select-padding-x + $custom-select-indicator-padding !default;
577+
$custom-select-feedback-icon-padding-right: math.div($input-height-inner * 3, 4) + $custom-select-padding-x + $custom-select-indicator-padding !default;
578578
$custom-select-feedback-icon-position: center right ($custom-select-padding-x + $custom-select-indicator-padding) !default;
579-
$custom-select-feedback-icon-size: ($input-height-inner / 2) ($input-height-inner / 2) !default;
579+
$custom-select-feedback-icon-size: math.div($input-height-inner, 2) math.div($input-height-inner, 2) !default;
580580

581581
$custom-select-border-width: $input-border-width !default;
582582
$custom-select-border-color: $input-border-color !default;
@@ -714,12 +714,12 @@ $nav-pills-link-active-color: $component-active-color !default;
714714
$nav-pills-link-active-bg: $component-active-bg !default;
715715

716716
$nav-divider-color: $gray-200 !default;
717-
$nav-divider-margin-y: $spacer / 2 !default;
717+
$nav-divider-margin-y: math.div($spacer, 2) !default;
718718

719719

720720
// Navbar
721721

722-
$navbar-padding-y: $spacer / 2 !default;
722+
$navbar-padding-y: math.div($spacer, 2) !default;
723723
$navbar-padding-x: $spacer !default;
724724

725725
$navbar-nav-link-padding-x: .5rem !default;
@@ -728,7 +728,7 @@ $navbar-brand-font-size: $font-size-lg !default;
728728
// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
729729
$nav-link-height: $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default;
730730
$navbar-brand-height: $navbar-brand-font-size * $line-height-base !default;
731-
$navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2 !default;
731+
$navbar-brand-padding-y: math.div($nav-link-height - $navbar-brand-height, 2) !default;
732732

733733
$navbar-toggler-padding-y: .25rem !default;
734734
$navbar-toggler-padding-x: .75rem !default;
@@ -806,7 +806,7 @@ $card-bg: $white !default;
806806

807807
$card-img-overlay-padding: 1.25rem !default;
808808

809-
$card-group-margin: $grid-gutter-width / 2 !default;
809+
$card-group-margin: math.div($grid-gutter-width, 2) !default;
810810
$card-deck-margin: $card-group-margin !default;
811811

812812
$card-columns-count: 3 !default;

0 commit comments

Comments
 (0)