From dcb6b8e6461e0e4c6ca88df213009bc88838d7a0 Mon Sep 17 00:00:00 2001 From: "d.strigo" Date: Thu, 9 Feb 2023 20:08:11 +0100 Subject: [PATCH] feat: update Angular Material 13 --- angular.json | 5 +++++ src/app/@theme/styles/material/_angular-material.scss | 2 +- src/app/@theme/styles/material/_material-dark.scss | 4 ++-- src/app/@theme/styles/material/_material-light.scss | 4 ++-- src/app/pages/forms/form-inputs/form-inputs.component.html | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/angular.json b/angular.json index 73d735f6..1c10d739 100644 --- a/angular.json +++ b/angular.json @@ -27,6 +27,11 @@ "output": "/assets/img/markers" } ], + "stylePreprocessorOptions": { + "includePaths": [ + "node_modules" + ] + }, "styles": [ "node_modules/bootstrap/dist/css/bootstrap.css", "node_modules/typeface-exo/index.css", diff --git a/src/app/@theme/styles/material/_angular-material.scss b/src/app/@theme/styles/material/_angular-material.scss index f9787f5f..6fb97f63 100644 --- a/src/app/@theme/styles/material/_angular-material.scss +++ b/src/app/@theme/styles/material/_angular-material.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @mixin angular-material() { @include mat.core(); diff --git a/src/app/@theme/styles/material/_material-dark.scss b/src/app/@theme/styles/material/_material-dark.scss index b991f81b..e5f3979d 100644 --- a/src/app/@theme/styles/material/_material-dark.scss +++ b/src/app/@theme/styles/material/_material-dark.scss @@ -4,8 +4,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. */ -@import '~@nebular/theme/styles/core/functions'; -@import '~@nebular/theme/styles/core/mixins'; +@import '@nebular/theme/styles/core/functions'; +@import '@nebular/theme/styles/core/mixins'; $theme: ( color-primary-100: #fff2f7, diff --git a/src/app/@theme/styles/material/_material-light.scss b/src/app/@theme/styles/material/_material-light.scss index fd033164..2178fa1e 100644 --- a/src/app/@theme/styles/material/_material-light.scss +++ b/src/app/@theme/styles/material/_material-light.scss @@ -4,8 +4,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. */ -@import '~@nebular/theme/styles/core/functions'; -@import '~@nebular/theme/styles/core/mixins'; +@import '@nebular/theme/styles/core/functions'; +@import '@nebular/theme/styles/core/mixins'; $theme: ( color-primary-100: #e8cbfe, diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html index 5e40366a..7eb0009e 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.html +++ b/src/app/pages/forms/form-inputs/form-inputs.component.html @@ -10,7 +10,7 @@ - + @@ -91,4 +91,4 @@
- \ No newline at end of file +