fix(styles): fixes theme definitions

8base · Dec 25, 2018 · c8b414b · c8b414b
1 parent a2e9437
commit c8b414b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/components/Form/FormField.js b/src/components/Form/FormField.js
@@ -18,15 +18,19 @@ type FormFieldProps = {
 const name = 'formField';
 
 const themeLabel = createComponentTheme(`${name}Label`, ({ COLORS, SIZES }: *) => ({
-  fontSize: SIZES.OVERLINE_1,
-  color: COLORS.SECONDARY_TEXT_COLOR,
-  lineHeight: 2,
+  root: {
+    fontSize: SIZES.OVERLINE_1,
+    lineHeight: SIZES.OVERLINE_1_LH,
+    color: COLORS.SECONDARY_TEXT_COLOR,
+  },
 }));
 
 const themeError = createComponentTheme(`${name}Error`, ({ COLORS, SIZES }: *) => ({
-  fontSize: SIZES.OVERLINE_2,
-  lineHeight: SIZES.OVERLINE_2_LH,
-  color: COLORS.DANGER,
+  root: {
+    fontSize: SIZES.OVERLINE_2,
+    lineHeight: SIZES.OVERLINE_2_LH,
+    color: COLORS.DANGER,
+  },
 }));
 
 const theme = {
@@ -57,7 +61,6 @@ const ControlErrorWrapperTag = createStyledTag(`${name}ErrorWrapper`, {
 
 
 export const ControlErrorTag = createStyledTag(`${name}Error`, {
-  lineHeight: 1,
   position: 'relative',
   top: '-2px',
 });

diff --git a/src/components/Modal/Modal.js b/src/components/Modal/Modal.js
@@ -31,8 +31,10 @@ injectGlobal`
 const name = 'modal';
 
 const themeOverlay = createComponentTheme(`${name}Overlay`, ({ Z_INDEX }: *) => ({
-  background: 'rgba(60, 87, 118, 0.6)',
-  zIndex: Z_INDEX.MODAL,
+  root: {
+    background: 'rgba(60, 87, 118, 0.6)',
+    zIndex: Z_INDEX.MODAL,
+  },
 }));
 
 const theme = {

diff --git a/src/components/Navigation/NavigationItem.js b/src/components/Navigation/NavigationItem.js
@@ -27,7 +27,9 @@ const themeMain = createComponentTheme(name, ({ COLORS }) => ({
 }));
 
 const themeLabel = createComponentTheme(`${name}Label`, ({ COLORS }) => ({
-  color: COLORS.LIGHT_PRIMARY_TEXT_COLOR,
+  root: {
+    color: COLORS.LIGHT_PRIMARY_TEXT_COLOR,
+  },
 }));
 
 const theme = {