refa: apply surface color in core theme again (#3901)

* refa: apply surface color in core theme again * Create two-clouds-press.md
marigold-ui · May 3, 2024 · 99d68a4 · 99d68a4
1 parent cd87f7c
commit 99d68a4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.changeset/two-clouds-press.md b/.changeset/two-clouds-press.md
@@ -0,0 +1,5 @@
+---
+"@marigold/theme-core": patch
+---
+
+refa: apply surface color in core theme again
diff --git a/docs/ui/ComponentDemo.tsx b/docs/ui/ComponentDemo.tsx
@@ -63,10 +63,7 @@ export const ComponentDemo = ({ name, children }: ComponentDemoProps) => {
             >
               <div id="portalContainer" className="not-prose" />
               <OverlayContainerProvider value="portalContainer">
-                <MarigoldProvider
-                  theme={(current && themes[current]) as Theme}
-                  className="bg-bg-surface"
-                >
+                <MarigoldProvider theme={(current && themes[current]) as Theme}>
                   <div className="not-prose size-full overflow-x-auto p-4">
                     <Wrapper>
                       <Demo />

diff --git a/packages/system/src/hooks/useTheme.tsx b/packages/system/src/hooks/useTheme.tsx
@@ -26,7 +26,7 @@ export function ThemeProvider<T extends Theme>({
   const root = theme.root?.();
   return (
     <InternalContext.Provider value={theme}>
-      <div className={cn(root ? root : '', className)}>{children}</div>
+      <div className={cn(root, className)}>{children}</div>
     </InternalContext.Provider>
   );
 }
diff --git a/themes/theme-core/src/root.ts b/themes/theme-core/src/root.ts
@@ -1,5 +1,5 @@
 import { Theme, cva } from '@marigold/system';
 
 export const root: Theme['root'] = cva(
-  'font-body text-text-base text-[13px] leading-normal'
+  'font-body text-text-base bg-bg-surface text-[13px] leading-normal'
 );