From 612250237c65a42a211467c0d986707b98f6f34d Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <hamelers@ebi.ac.uk>
Date: Mon, 26 Nov 2018 16:29:35 +0000
Subject: [PATCH] feat(ui): upgrade styled-components
Upgrade to styled components and create new GlobalStyle component in @pubsweet/ui
BREAKING CHANGE: Replace styled-components injectGlobal with new createGlobalStyle
---
packages/ui/package.json | 2 +-
packages/ui/src/atoms/GlobalStyle.js | 10 ++++++++++
packages/ui/src/atoms/GlobalStyle.md | 1 +
packages/ui/src/atoms/index.js | 1 +
4 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 packages/ui/src/atoms/GlobalStyle.js
create mode 100644 packages/ui/src/atoms/GlobalStyle.md
diff --git a/packages/ui/package.json b/packages/ui/package.json
index a9e0dc29a..717a7b9dd 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -33,7 +33,7 @@
"recompose": "^0.26.0",
"redux": "^3.6.0",
"redux-form": "^7.0.3",
- "styled-components": "^3.2.5"
+ "styled-components": "^4.1.1"
},
"devDependencies": {
"@pubsweet/styleguide": "^3.2.0",
diff --git a/packages/ui/src/atoms/GlobalStyle.js b/packages/ui/src/atoms/GlobalStyle.js
new file mode 100644
index 000000000..36d5af70c
--- /dev/null
+++ b/packages/ui/src/atoms/GlobalStyle.js
@@ -0,0 +1,10 @@
+import { createGlobalStyle } from 'styled-components'
+import { th } from '@pubsweet/ui-toolkit'
+
+const GlobalStyle = createGlobalStyle`
+ body {
+ color: ${th('colorText')};
+ }
+`
+
+export default GlobalStyle
diff --git a/packages/ui/src/atoms/GlobalStyle.md b/packages/ui/src/atoms/GlobalStyle.md
new file mode 100644
index 000000000..c970de94d
--- /dev/null
+++ b/packages/ui/src/atoms/GlobalStyle.md
@@ -0,0 +1 @@
+A placeholder for global styles to be imported into the project.
diff --git a/packages/ui/src/atoms/index.js b/packages/ui/src/atoms/index.js
index 3a4b9ef56..b73a753fe 100644
--- a/packages/ui/src/atoms/index.js
+++ b/packages/ui/src/atoms/index.js
@@ -7,6 +7,7 @@ export { default as Badge } from './Badge'
export { default as Button } from './Button'
export { default as Checkbox } from './Checkbox'
export { default as File } from './File'
+export { default as GlobalStyle } from './GlobalStyle'
export { default as Radio } from './Radio'
export { default as Tags } from './Tags'
export { default as Tab } from './Tab'
--
GitLab