Roll back style syntax change

henck · Feb 8, 2024 · 4a5ebd2 · 4a5ebd2
1 parent ada8e2c
commit 4a5ebd2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@independent-software/typeui",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "description": "TypeUI",
   "keywords": [
     "react",

diff --git a/src/styles/StyleBase.tsx b/src/styles/StyleBase.tsx
@@ -1,7 +1,7 @@
 import { Theme } from './Theme'
-import { createGlobalStyle } from 'styled-components'
+import { css, createGlobalStyle, GlobalStyleComponent, DefaultTheme } from 'styled-components'
 
-const StyleBase = createGlobalStyle`
+const base = css`
   @import url(${Theme.fontURL});
   
   body {
@@ -49,4 +49,8 @@ const StyleBase = createGlobalStyle`
   }
 `;
 
-export { StyleBase }
+const StyleBase = createGlobalStyle`
+  ${base}
+`;
+
+export { StyleBase };
diff --git a/src/styles/StyleReset.tsx b/src/styles/StyleReset.tsx
@@ -1,6 +1,6 @@
-import { createGlobalStyle } from 'styled-components'
+import { css, createGlobalStyle, GlobalStyleComponent, DefaultTheme } from 'styled-components'
 
-const StyleReset = createGlobalStyle`
+const reset = css`
   /* http://meyerweb.com/eric/tools/css/reset/
     v4.0 | 20180602
     License: none (public domain)
@@ -54,4 +54,8 @@ const StyleReset = createGlobalStyle`
   }
 `;
 
-export { StyleReset }
+const StyleReset = createGlobalStyle`
+  ${reset}
+`
+
+export { StyleReset };