From 9d9341901f2b5b14e3a29a6bdc18a505d9b361aa Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 12 Jun 2018 15:25:47 -0700
Subject: Use Text component for HeaderItem

---
 packages/website/ts/components/ui/text.tsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages/website/ts/components/ui/text.tsx')

diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index e90c1707d..2b80869d1 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -11,6 +11,7 @@ export interface TextProps {
     fontFamily?: string;
     fontColor?: string;
     lineHeight?: string;
+    minHeight?: string;
     center?: boolean;
     fontWeight?: number;
 }
@@ -26,6 +27,7 @@ export const Text = styled(PlainText)`
     ${props => (props.lineHeight ? `line-height: ${props.lineHeight}` : '')};
     ${props => (props.center ? 'text-align: center' : '')};
     color: ${props => props.fontColor};
+    min-height: ${props => props.minHeight};
 `;
 
 Text.defaultProps = {
-- 
cgit v1.2.3


From 2794d64d3e920cd30ed0603becffc74b17c22218 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 12 Jun 2018 15:54:27 -0700
Subject: Use Text in OpenPositions

---
 packages/website/ts/components/ui/text.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/website/ts/components/ui/text.tsx')

diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index 2b80869d1..0fa79bc7c 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -13,7 +13,7 @@ export interface TextProps {
     lineHeight?: string;
     minHeight?: string;
     center?: boolean;
-    fontWeight?: number;
+    fontWeight?: number | string;
 }
 
 const PlainText: React.StatelessComponent<TextProps> = ({ children, className, Tag }) => (
-- 
cgit v1.2.3


From 8a3df7e434c98d75e0a8ccaec8c16122d5a2952b Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Wed, 13 Jun 2018 12:19:14 -0700
Subject: Update minHeight in Text

---
 packages/website/ts/components/ui/text.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/website/ts/components/ui/text.tsx')

diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index 0fa79bc7c..7e47f1d09 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -27,7 +27,7 @@ export const Text = styled(PlainText)`
     ${props => (props.lineHeight ? `line-height: ${props.lineHeight}` : '')};
     ${props => (props.center ? 'text-align: center' : '')};
     color: ${props => props.fontColor};
-    min-height: ${props => props.minHeight};
+    ${props => (props.minHeight ? `min-height: ${props.minHeight}` : '')};
 `;
 
 Text.defaultProps = {
-- 
cgit v1.2.3