From 64a6b60b2e255abc364184ac9c2f2eef8757da9a Mon Sep 17 00:00:00 2001 From: yavorsk Date: Tue, 30 Jul 2024 14:06:12 +0300 Subject: [PATCH] fix fontawesome imports --- .../src/templates/angular-xmcloud/angular.json | 2 +- .../styles/sass/base/richtext/_richtext-files-icons.scss | 4 ++-- .../styles/sass/components/_component-column-splitter.scss | 4 ++-- .../sass/components/link-list/_component-link-list.scss | 4 ++-- .../styles/sass/components/navigation/_navigation-fat.scss | 4 ++-- .../navigation/_navigation-main-horizontal-vertical.scss | 4 ++-- .../styles/sass/components/navigation/_navigation-mobile.scss | 4 ++-- .../sass/components/navigation/_sitemap-navigation.scss | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/create-sitecore-jss/src/templates/angular-xmcloud/angular.json b/packages/create-sitecore-jss/src/templates/angular-xmcloud/angular.json index b5d1eec28d..e270fbc220 100644 --- a/packages/create-sitecore-jss/src/templates/angular-xmcloud/angular.json +++ b/packages/create-sitecore-jss/src/templates/angular-xmcloud/angular.json @@ -26,7 +26,7 @@ "src/assets/styles/main.scss" ], "stylePreprocessorOptions": { - "includePaths": ["src/assets/styles", "node_modules/font-awesome"] + "includePaths": ["src/assets/styles", "node_modules"] }, "scripts": [], "allowedCommonJsDependencies": [ diff --git a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/base/richtext/_richtext-files-icons.scss b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/base/richtext/_richtext-files-icons.scss index 28076bfe29..23b1c07c3b 100644 --- a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/base/richtext/_richtext-files-icons.scss +++ b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/base/richtext/_richtext-files-icons.scss @@ -1,5 +1,5 @@ -@import 'fontawesome/scss/mixins'; -@import 'fontawesome/scss/variables'; +@import 'font-awesome/scss/mixins'; +@import 'font-awesome/scss/variables'; @import "sass/abstracts/mixins"; //files icons diff --git a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/_component-column-splitter.scss b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/_component-column-splitter.scss index 5a9d17a4c3..255a08a1a3 100644 --- a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/_component-column-splitter.scss +++ b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/_component-column-splitter.scss @@ -3,8 +3,8 @@ .row.column-splitter { margin-left: 0; margin-right: 0; - padding-left: $default-padding / 2; - padding-right: $default-padding / 2; + padding-left: calc($default-padding / 2); + padding-right: calc($default-padding / 2); max-width: none; > div { diff --git a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/link-list/_component-link-list.scss b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/link-list/_component-link-list.scss index 53f22e6eec..2cd58467b1 100644 --- a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/link-list/_component-link-list.scss +++ b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/link-list/_component-link-list.scss @@ -1,7 +1,7 @@ @import "sass/abstracts/mixins"; @import "sass/abstracts/vars"; -@import 'fontawesome/scss/mixins'; -@import "fontawesome/scss/variables"; +@import 'font-awesome/scss/mixins'; +@import "font-awesome/scss/variables"; .link-list { background: $link-list-bg; diff --git a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-fat.scss b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-fat.scss index 505e2077e8..2397bdd7f1 100644 --- a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-fat.scss +++ b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-fat.scss @@ -1,7 +1,7 @@ @import 'sass/abstracts/vars'; @import 'sass/abstracts/mixins'; -@import 'fontawesome/scss/mixins'; -@import 'fontawesome/scss/variables'; +@import 'font-awesome/scss/mixins'; +@import 'font-awesome/scss/variables'; .navigation.navigation-fat { background: $bg-basic-color; diff --git a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-main-horizontal-vertical.scss b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-main-horizontal-vertical.scss index 3d92676f6a..3b320dcbfb 100644 --- a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-main-horizontal-vertical.scss +++ b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-main-horizontal-vertical.scss @@ -1,7 +1,7 @@ @import 'sass/abstracts/vars'; @import 'sass/abstracts/mixins'; -@import 'fontawesome/scss/mixins'; -@import 'fontawesome/scss/variables'; +@import 'font-awesome/scss/mixins'; +@import 'font-awesome/scss/variables'; $borderSize: 2px; diff --git a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-mobile.scss b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-mobile.scss index 4aecf0daac..f3998fe5bd 100644 --- a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-mobile.scss +++ b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_navigation-mobile.scss @@ -1,7 +1,7 @@ @import 'sass/abstracts/vars'; @import 'sass/abstracts/mixins'; -@import 'fontawesome/scss/mixins'; -@import 'fontawesome/scss/variables'; +@import 'font-awesome/scss/mixins'; +@import 'font-awesome/scss/variables'; .navigation.navigation-mobile { nav > ul { diff --git a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_sitemap-navigation.scss b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_sitemap-navigation.scss index 3aff4ef4d9..b23b2d348f 100644 --- a/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_sitemap-navigation.scss +++ b/packages/create-sitecore-jss/src/templates/angular-xmcloud/src/assets/styles/sass/components/navigation/_sitemap-navigation.scss @@ -1,7 +1,7 @@ @import 'sass/abstracts/vars'; @import 'sass/abstracts/mixins'; -@import 'fontawesome/scss/mixins'; -@import 'fontawesome/scss/variables'; +@import 'font-awesome/scss/mixins'; +@import 'font-awesome/scss/variables'; .navigation.sitemap-navigation { .level2 a {