From e83919d431b76379ca6ddce9e992d298ee4c3562 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Sat, 30 Mar 2024 09:08:00 +0000
Subject: [PATCH] Refactor

---
 components/lib/themes/config/index.js     | 4 ++--
 components/lib/themes/utils/themeUtils.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/lib/themes/config/index.js b/components/lib/themes/config/index.js
index 658172380..907c351cf 100644
--- a/components/lib/themes/config/index.js
+++ b/components/lib/themes/config/index.js
@@ -10,10 +10,10 @@ export default {
         options: {
             prefix: 'p',
             darkModeSelector: 'system',
-            cssLayer: {
+            cssLayer: false /*{
                 name: 'primevue',
                 order: 'primevue'
-            }
+            }*/
         }
     },
     _pConfig: undefined,
diff --git a/components/lib/themes/utils/themeUtils.js b/components/lib/themes/utils/themeUtils.js
index 2e52e4f57..d2a4cf784 100644
--- a/components/lib/themes/utils/themeUtils.js
+++ b/components/lib/themes/utils/themeUtils.js
@@ -129,8 +129,9 @@ export default {
             .reduce((acc, [key, value]) => {
                 if (value) {
                     const _css = SharedUtils.object.minifyCSS(value);
+                    const id = key === 'global' ? `${key}-style` : `${key}-variables`;
 
-                    acc.push(`<style type="text/css" data-primevue-style-id="${key}" ${_props}>${_css}</style>`);
+                    acc.push(`<style type="text/css" data-primevue-style-id="${id}" ${_props}>${_css}</style>`);
                 }
 
                 return acc;