Skip to content

Commit

Permalink
Merge pull request NationalBankBelgium#49 from mhenkens/feature/wrong…
Browse files Browse the repository at this point in the history
…-version-material

fix(demo): fix wrong version of @angular/material
  • Loading branch information
SuperITMan authored Jan 8, 2024
2 parents f260ed9 + 40b8f04 commit 895e299
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 28 deletions.
41 changes: 21 additions & 20 deletions demo-app/ng13/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions demo-app/ng13/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"private": true,
"dependencies": {
"@angular/animations": "^13.4.0",
"@angular/cdk": "^12.2.13",
"@angular/cdk": "^13.3.9",
"@angular/common": "^13.4.0",
"@angular/compiler": "^13.4.0",
"@angular/core": "^13.4.0",
"@angular/forms": "^13.4.0",
"@angular/material": "^12.2.13",
"@angular/material": "^13.3.9",
"@angular/platform-browser": "^13.4.0",
"@angular/platform-browser-dynamic": "^13.4.0",
"@angular/router": "^13.4.0",
Expand Down Expand Up @@ -56,4 +56,4 @@
"tslint-config-prettier": "^1.17.0",
"typescript": "~4.6.4"
}
}
}
2 changes: 1 addition & 1 deletion demo-app/ng13/src/app/components/card/card.theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "~@angular/material" as mat;
@use "@angular/material" as mat;
@mixin card-theme($theme) {
$primary: map-get($theme, primary);
$accent: map-get($theme, accent);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "~@angular/material" as mat;
@use "@angular/material" as mat;
@mixin language-selector-theme($theme) {
$primary: map-get($theme, primary);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "~@angular/material" as mat;
@use "@angular/material" as mat;
@mixin app-navigation-theme($theme) {
$primary: map-get($theme, primary);
$accent: map-get($theme, accent);
Expand Down
4 changes: 2 additions & 2 deletions demo-app/ng13/src/styles/_app.theme.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "~@angular/material" as mat;
@import "~@angular/material/theming";
@use "@angular/material" as mat;
@import "@angular/material/theming";
@import "../app/components/navigation/navigation.theme";
@import "../app/components/language-selector/language-selector.theme";
@import "../app/components/card/card.theme";
Expand Down

0 comments on commit 895e299

Please sign in to comment.