chore: wip

Author: chrisbbreuer

.stacks/core/ui/src/uno.config.ts

@@ -37,9 +37,5 @@ export default defineConfig({
     transformerDirectives(),
     transformerVariantGroup(),
   ],
-<<<<<<< Updated upstream
   safelist: 'prose m-auto text-left'.split(' '),
-=======
-  safelist: 'prose prose-sm m-auto text-left'.split(' '),
->>>>>>> Stashed changes
 })

.stacks/core/vite/src/plugin/css-engine.ts

@@ -1,13 +1,8 @@
 import UnoCSS from 'unocss/vite'
-import { uiPath } from '@stacksjs/path'
-import { runCommand } from '@stacksjs/cli'
+// import { uiPath } from '@stacksjs/path'
+// import { runCommand } from '@stacksjs/cli'
 
-<<<<<<< Updated upstream
-export function cssEngine(isWebComponent = false) {
-=======
 export async function cssEngine(isWebComponent = false) {
-  
->>>>>>> Stashed changes
   return UnoCSS({
     configFile: '.stacks/core/ui/src/uno.config.ts',
     // mode: isWebComponent ? 'shadow-dom' : 'vu'

.stacks/core/vite/src/uno.config.ts

@@ -1,43 +1,4 @@
 import {
-<<<<<<< Updated upstream
-  defineConfig,
-  presetAttributify,
-  presetIcons,
-  presetTypography,
-  presetUno,
-  presetWebFonts,
-  transformerDirectives,
-  transformerVariantGroup,
-} from 'unocss'
-
-export default defineConfig({
-  shortcuts: [
-    ['btn', 'px-4 py-1 rounded inline-block bg-teal-700 text-white cursor-pointer !outline-none hover:bg-teal-800 disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'],
-    ['icon-btn', 'inline-block cursor-pointer select-none opacity-75 transition duration-200 ease-in-out hover:opacity-100 hover:text-teal-600'],
-  ],
-  presets: [
-    presetUno(),
-    presetAttributify(),
-    presetIcons({
-      scale: 1.2,
-      warn: true,
-    }),
-    presetTypography(),
-    presetWebFonts({
-      fonts: {
-        sans: 'DM Sans',
-        serif: 'DM Serif Display',
-        mono: 'DM Mono',
-      },
-    }),
-  ],
-  transformers: [
-    transformerDirectives(),
-    transformerVariantGroup(),
-  ],
-  safelist: 'prose m-auto text-left'.split(' '),
-})
-=======
     defineConfig,
     presetAttributify,
     presetIcons,
@@ -49,7 +10,7 @@ export default defineConfig({
     transformerVariantGroup,
   } from 'unocss'
   import { presetForms } from '@julr/unocss-preset-forms'
-  
+
   export default defineConfig({
     shortcuts: [
       ['btn', 'px-4 py-1 rounded inline-block bg-teal-700 text-white cursor-pointer hover:bg-teal-800 disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'],
@@ -78,5 +39,4 @@ export default defineConfig({
     ],
     safelist: 'prose prose-sm m-auto text-left'.split(' '),
   })
-  
->>>>>>> Stashed changes
+