angular17

zigbeefordomoticz · Mar 17, 2024 · 6cfc06d · 6cfc06d
1 parent 88d001c
commit 6cfc06d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/angular.json b/angular.json
@@ -17,35 +17,20 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "allowedCommonJsDependencies": [
-              "highcharts",
-              "subsink",
-              "file-saver",
-              "clone-deep"
-            ],
+            "allowedCommonJsDependencies": ["highcharts", "subsink", "file-saver", "clone-deep"],
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "tsConfig": "tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
-            "assets": [
-              "src/favicon.ico",
-              "src/apple-touch-icon.png",
-              "src/robots.txt",
-              "src/assets"
-            ],
+            "assets": ["src/favicon.ico", "src/apple-touch-icon.png", "src/robots.txt", "src/assets"],
             "styles": [
-              "node_modules/primeicons/primeicons.css",
-              "node_modules/primeng/resources/themes/lara-light-blue/theme.css",
-              "node_modules/primeng/resources/primeng.min.css",
               "node_modules/ngx-spinner/animations/line-spin-clockwise-fade-rotating.css",
               "node_modules/ngx-spinner/animations/line-scale.css",
               "src/main.scss"
             ],
             "stylePreprocessorOptions": {
-              "includePaths": [
-                "./node_modules"
-              ]
+              "includePaths": ["./node_modules"]
             },
             "scripts": [],
             "vendorChunk": true,
@@ -115,10 +100,7 @@
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
         }
       }
@@ -127,4 +109,4 @@
   "cli": {
     "analytics": false
   }
-}
+}
diff --git a/src/main.scss b/src/main.scss
@@ -42,11 +42,15 @@ html {
 @import "theme/theme-variables";
 
 // 3rd party libraries
-@import "bootstrap/scss/bootstrap";
+@import "bootstrap/dist/css/bootstrap.min.css" layer(bootstrap);
 @import "@fortawesome/fontawesome-free/scss/fontawesome.scss";
 @import "@fortawesome/fontawesome-free/scss/brands.scss";
 @import "@fortawesome/fontawesome-free/scss/regular.scss";
 @import "@fortawesome/fontawesome-free/scss/solid.scss";
 
+@import "primeicons/primeicons.css";
+@import "primeng/resources/themes/lara-light-blue/theme.css";
+@import "primeng/resources/primeng.min.css";
+
 // Theme customization
 @import "theme/theme";