From 513019e17de44b71f90c4fbedc2ed6e9ea44a90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20=C3=87etin?= <92744169+mehmetcetin01140@users.noreply.github.com> Date: Mon, 6 Jan 2025 10:31:07 +0300 Subject: [PATCH] fix tailwind issue --- package-lock.json | 12 ++++++++---- package.json | 8 +++++--- src/assets/styles.scss | 1 - src/assets/tailwind.css | 3 --- src/styles.scss | 5 +++++ 5 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 src/assets/tailwind.css diff --git a/package-lock.json b/package-lock.json index 10e77fa..d744a71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,9 +19,9 @@ "@primeng/themes": "^19.0.2", "chart.js": "4.4.2", "primeclt": "^0.1.5", + "primeicons": "^7.0.0", "primeng": "^19.0.2", "rxjs": "~7.8.0", - "tailwindcss": "^3.4.6", "tailwindcss-primeui": "^0.3.2", "tslib": "^2.3.0", "zone.js": "~0.15.0" @@ -31,6 +31,7 @@ "@angular/cli": "^19.0.6", "@angular/compiler-cli": "^19.0.0", "@types/jasmine": "~5.1.0", + "autoprefixer": "^10.4.20", "eslint": "^9.14.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.31.0", @@ -42,8 +43,9 @@ "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.1.0", + "postcss": "^8.4.49", "prettier": "^3.0.0", - "primeicons": "^7.0.0", + "tailwindcss": "^3.4.17", "typescript": "~5.6.2" } }, @@ -5571,6 +5573,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "browserslist": "^4.23.3", "caniuse-lite": "^1.0.30001646", @@ -12354,6 +12357,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.1.1", @@ -13138,8 +13142,7 @@ "node_modules/primeicons": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-7.0.0.tgz", - "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw==", - "dev": true + "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw==" }, "node_modules/primeng": { "version": "19.0.2", @@ -14927,6 +14930,7 @@ "version": "3.4.17", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz", "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==", + "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", diff --git a/package.json b/package.json index c3d99f2..85bddd8 100644 --- a/package.json +++ b/package.json @@ -21,19 +21,19 @@ "@primeng/themes": "^19.0.2", "chart.js": "4.4.2", "primeclt": "^0.1.5", + "primeicons": "^7.0.0", "primeng": "^19.0.2", "rxjs": "~7.8.0", - "tailwindcss": "^3.4.6", "tailwindcss-primeui": "^0.3.2", "tslib": "^2.3.0", - "zone.js": "~0.15.0", - "primeicons": "^7.0.0" + "zone.js": "~0.15.0" }, "devDependencies": { "@angular-devkit/build-angular": "^19.0.6", "@angular/cli": "^19.0.6", "@angular/compiler-cli": "^19.0.0", "@types/jasmine": "~5.1.0", + "autoprefixer": "^10.4.20", "eslint": "^9.14.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.31.0", @@ -45,7 +45,9 @@ "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.1.0", + "postcss": "^8.4.49", "prettier": "^3.0.0", + "tailwindcss": "^3.4.17", "typescript": "~5.6.2" } } diff --git a/src/assets/styles.scss b/src/assets/styles.scss index 4ceb075..021290c 100644 --- a/src/assets/styles.scss +++ b/src/assets/styles.scss @@ -2,5 +2,4 @@ @use './assets/layout/layout'; @use 'primeicons/primeicons.css'; @use './assets/demo/demo'; -@import './tailwind.css'; diff --git a/src/assets/tailwind.css b/src/assets/tailwind.css deleted file mode 100644 index b5c61c9..0000000 --- a/src/assets/tailwind.css +++ /dev/null @@ -1,3 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; diff --git a/src/styles.scss b/src/styles.scss index 6f31380..2a9a6db 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -3,3 +3,8 @@ @use 'primeicons/primeicons.css'; @use './assets/demo/demo.scss'; +@tailwind base; +@tailwind components; +@tailwind utilities; + +