From a2020617fd98479043003c0fc0ed3d33333831c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Berg=C3=A9?= Date: Thu, 1 Nov 2018 09:28:31 +0100 Subject: [PATCH] fix(globalStyle): correctly export normalize --- packages/shared/core/theme/globalStyle.js | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/shared/core/theme/globalStyle.js b/packages/shared/core/theme/globalStyle.js index b597a9adb..b71c80537 100644 --- a/packages/shared/core/theme/globalStyle.js +++ b/packages/shared/core/theme/globalStyle.js @@ -2,19 +2,20 @@ import { normalize } from 'polished' import * as defaultTheme from '../theme' import { th } from '../utils/system' -const globalStyle = (customTheme = defaultTheme) => ` - ${normalize()}; +const globalStyle = (customTheme = defaultTheme) => [ + ...normalize(), + ` + html, + body { + font-family: ${th('fontFamily')({ theme: customTheme })}; + font-size: ${th('fontSizeBase')({ theme: customTheme })}; + line-height: ${th('lineHeightBase')({ theme: customTheme })}; + } - html, - body { - font-family: ${th('fontFamily')({ theme: customTheme })}; - font-size: ${th('fontSizeBase')({ theme: customTheme })}; - line-height: ${th('lineHeightBase')({ theme: customTheme })}; - } - - * { - box-sizing: border-box; - } -` + * { + box-sizing: border-box; + } + `, +] export default globalStyle