Supports overrides on variants

artsy · Jul 20, 2020 · 39a507a · 39a507a
1 parent 6e5729f
commit 39a507a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/palette/src/elements/Text/Text.story.tsx b/packages/palette/src/elements/Text/Text.story.tsx
@@ -146,6 +146,10 @@ storiesOf("Components/Text", module)
         lineHeight: "solid",
         letterSpacing: "tightest",
       },
+      {
+        variant: 'text',
+        lineHeight: 'solid'
+      }
     ]
 
     return (

diff --git a/packages/palette/src/elements/Text/Text.tsx b/packages/palette/src/elements/Text/Text.tsx
@@ -14,12 +14,13 @@ export const overflowEllipsisMixin = css`
 /** Text */
 export const Text = styled.div<TextProps & { overflowEllipsis?: boolean }>`
   ${variant({ variants: TEXT_VARIANTS.small })}
+  ${textMixin}
 
   @media (min-width: ${themeGet("breakpoints.0")}) {
     ${variant({ variants: TEXT_VARIANTS.large })}
+    ${textMixin}
   }
 
-  ${textMixin}
   ${({ overflowEllipsis }) => overflowEllipsis && overflowEllipsisMixin}
 `