From 700b7068a157a0f9d3d6ce3f61150c2961d81617 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 3 Oct 2018 14:08:08 -0700
Subject: Add styled-components with theme

---
 packages/instant/src/components/zero_ex_instant.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/zero_ex_instant.tsx b/packages/instant/src/components/zero_ex_instant.tsx
index 67e1b683d..43398cf3b 100644
--- a/packages/instant/src/components/zero_ex_instant.tsx
+++ b/packages/instant/src/components/zero_ex_instant.tsx
@@ -1,5 +1,11 @@
 import * as React from 'react';
 
+import { ThemeProvider } from '../style/theme';
+
 export interface ZeroExInstantProps {}
 
-export const ZeroExInstant: React.StatelessComponent<ZeroExInstantProps> = () => <div>ZeroExInstant</div>;
+export const ZeroExInstant: React.StatelessComponent<ZeroExInstantProps> = () => (
+    <ThemeProvider>
+        <div> ZeroExInstant </div>
+    </ThemeProvider>
+);
-- 
cgit 


From 15f20cc18e45d2971be7274bc3c0be36b02091c8 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 3 Oct 2018 14:28:07 -0700
Subject: Add redux to 0x instant

---
 packages/instant/src/components/zero_ex_instant.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/zero_ex_instant.tsx b/packages/instant/src/components/zero_ex_instant.tsx
index 43398cf3b..9ba390be9 100644
--- a/packages/instant/src/components/zero_ex_instant.tsx
+++ b/packages/instant/src/components/zero_ex_instant.tsx
@@ -1,11 +1,15 @@
 import * as React from 'react';
+import { Provider } from 'react-redux';
 
-import { ThemeProvider } from '../style/theme';
+import { store } from '../redux/store';
+import { theme, ThemeProvider } from '../style/theme';
 
 export interface ZeroExInstantProps {}
 
 export const ZeroExInstant: React.StatelessComponent<ZeroExInstantProps> = () => (
-    <ThemeProvider>
-        <div> ZeroExInstant </div>
-    </ThemeProvider>
+    <Provider store={store}>
+        <ThemeProvider theme={theme}>
+            <div> ZeroExInstant </div>
+        </ThemeProvider>
+    </Provider>
 );
-- 
cgit 


From 4b8348da8cc50ef0da6e6b2bb7d276f1246437cf Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 3 Oct 2018 16:20:39 -0700
Subject: Add some ui components

---
 packages/instant/src/components/ui/button.tsx      | 68 ++++++++++++++++++++
 packages/instant/src/components/ui/text.tsx        | 75 ++++++++++++++++++++++
 .../instant/src/components/zero_ex_instant.tsx     |  3 +
 3 files changed, 146 insertions(+)
 create mode 100644 packages/instant/src/components/ui/button.tsx
 create mode 100644 packages/instant/src/components/ui/text.tsx

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/ui/button.tsx b/packages/instant/src/components/ui/button.tsx
new file mode 100644
index 000000000..ec0a87345
--- /dev/null
+++ b/packages/instant/src/components/ui/button.tsx
@@ -0,0 +1,68 @@
+import { darken, saturate } from 'polished';
+import * as React from 'react';
+
+import { ColorOption, styled } from '../../style/theme';
+
+export interface ButtonProps {
+    fontColor: ColorOption;
+    backgroundColor: ColorOption;
+    borderColor?: ColorOption;
+    fontSize?: string;
+    fontFamily?: string;
+    width?: string;
+    padding?: string;
+    type?: string;
+    isDisabled?: boolean;
+    onClick?: (event: React.MouseEvent<HTMLElement>) => void;
+    className?: string;
+}
+
+const PlainButton: React.StatelessComponent<ButtonProps> = ({ children, isDisabled, onClick, type, className }) => (
+    <button type={type} className={className} onClick={isDisabled ? undefined : onClick} disabled={isDisabled}>
+        {children}
+    </button>
+);
+
+const darkenOnHoverAmount = 0.1;
+const darkenOnActiveAmount = 0.2;
+const saturateOnFocusAmount = 0.2;
+export const Button = styled(PlainButton)`
+    cursor: ${props => (props.isDisabled ? 'default' : 'pointer')};
+    font-size: ${props => props.fontSize};
+    color: ${props => props.fontColor};
+    transition: background-color, opacity 0.5s ease;
+    padding: ${props => props.padding};
+    border-radius: 6px;
+    font-weight: 500;
+    outline: none;
+    font-family: ${props => props.fontFamily};
+    width: ${props => props.width};
+    background-color: ${props => props.backgroundColor};
+    border: ${props => (props.borderColor ? `1px solid ${props.theme[props.borderColor]}` : 'none')};
+    &:hover {
+        background-color: ${props =>
+            !props.isDisabled ? darken(darkenOnHoverAmount, props.theme[props.backgroundColor]) : ''} !important;
+    }
+    &:active {
+        background-color: ${props =>
+            !props.isDisabled ? darken(darkenOnActiveAmount, props.theme[props.backgroundColor]) : ''};
+    }
+    &:disabled {
+        opacity: 0.5;
+    }
+    &:focus {
+        background-color: ${props => saturate(saturateOnFocusAmount, props.theme[props.backgroundColor])};
+    }
+`;
+
+Button.defaultProps = {
+    fontSize: '12px',
+    fontColor: ColorOption.white,
+    backgroundColor: ColorOption.primaryColor,
+    width: 'auto',
+    fontFamily: 'Inter UI',
+    isDisabled: false,
+    padding: '0.8em 2.2em',
+};
+
+Button.displayName = 'Button';
diff --git a/packages/instant/src/components/ui/text.tsx b/packages/instant/src/components/ui/text.tsx
new file mode 100644
index 000000000..a4b9d60d7
--- /dev/null
+++ b/packages/instant/src/components/ui/text.tsx
@@ -0,0 +1,75 @@
+import { darken } from 'polished';
+import * as React from 'react';
+
+import { ColorOption, styled } from '../../style/theme';
+
+export type TextTag = 'p' | 'div' | 'span' | 'label' | 'h1' | 'h2' | 'h3' | 'h4' | 'i';
+
+export interface TextProps {
+    fontColor: ColorOption;
+    fontFamily: string;
+    fontStyle: string;
+    fontSize: string;
+    lineHeight: string;
+    className?: string;
+    Tag?: TextTag;
+    minHeight?: string;
+    center?: boolean;
+    fontWeight?: number | string;
+    textDecorationLine?: string;
+    onClick?: (event: React.MouseEvent<HTMLElement>) => void;
+    hoverColor?: string;
+    noWrap?: boolean;
+    display?: string;
+}
+
+const PlainText: React.StatelessComponent<TextProps> = ({ children, className, onClick, Tag }) => (
+    <Tag className={className} onClick={onClick}>
+        {children}
+    </Tag>
+);
+
+const darkenOnHoverAmount = 0.3;
+export const Text = styled(PlainText)`
+    font-family: ${props => props.fontFamily};
+    font-style: ${props => props.fontStyle};
+    font-weight: ${props => props.fontWeight};
+    font-size: ${props => props.fontSize};
+    text-decoration-line: ${props => props.textDecorationLine};
+    ${props => (props.lineHeight ? `line-height: ${props.lineHeight}` : '')};
+    ${props => (props.center ? 'text-align: center' : '')};
+    color: ${props => props.theme[props.fontColor]};
+    ${props => (props.minHeight ? `min-height: ${props.minHeight}` : '')};
+    ${props => (props.onClick ? 'cursor: pointer' : '')};
+    transition: color 0.5s ease;
+    ${props => (props.noWrap ? 'white-space: nowrap' : '')};
+    ${props => (props.display ? `display: ${props.display}` : '')};
+    &:hover {
+        ${props => (props.onClick ? `color: ${props.hoverColor || darken(darkenOnHoverAmount, props.fontColor)}` : '')};
+    }
+`;
+
+Text.defaultProps = {
+    fontFamily: 'Inter UI',
+    fontStyle: 'normal',
+    fontWeight: 400,
+    fontColor: ColorOption.black,
+    fontSize: '15px',
+    lineHeight: '1.5em',
+    textDecorationLine: 'none',
+    Tag: 'div',
+    noWrap: false,
+};
+
+Text.displayName = 'Text';
+
+export const Title: React.StatelessComponent<TextProps> = props => <Text {...props} />;
+
+Title.defaultProps = {
+    Tag: 'h2',
+    fontSize: '20px',
+    fontWeight: 600,
+    fontColor: ColorOption.primaryColor,
+};
+
+Title.displayName = 'Title';
diff --git a/packages/instant/src/components/zero_ex_instant.tsx b/packages/instant/src/components/zero_ex_instant.tsx
index 9ba390be9..99f9bb3ba 100644
--- a/packages/instant/src/components/zero_ex_instant.tsx
+++ b/packages/instant/src/components/zero_ex_instant.tsx
@@ -2,8 +2,11 @@ import * as React from 'react';
 import { Provider } from 'react-redux';
 
 import { store } from '../redux/store';
+import { fonts } from '../style/fonts';
 import { theme, ThemeProvider } from '../style/theme';
 
+fonts.include();
+
 export interface ZeroExInstantProps {}
 
 export const ZeroExInstant: React.StatelessComponent<ZeroExInstantProps> = () => (
-- 
cgit 


From 85c34b17aa074e67ed9263094cc0ee75a8f00e60 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 14:04:56 -0700
Subject: Add Flex and Container component

---
 packages/instant/src/components/ui/container.tsx | 47 ++++++++++++++++++++++++
 packages/instant/src/components/ui/flex.tsx      | 34 +++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 packages/instant/src/components/ui/container.tsx
 create mode 100644 packages/instant/src/components/ui/flex.tsx

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
new file mode 100644
index 000000000..f928ed25b
--- /dev/null
+++ b/packages/instant/src/components/ui/container.tsx
@@ -0,0 +1,47 @@
+import * as React from 'react';
+
+import { ColorOption, styled } from '../../style/theme';
+import { cssRuleIfExists } from '../../style/util';
+
+export interface ContainerProps {
+    display?: string;
+    position?: string;
+    top?: string;
+    right?: string;
+    bottom?: string;
+    left?: string;
+    maxWidth?: string;
+    margin: string;
+    marginTop?: string;
+    marginRight?: string;
+    marginBottom?: string;
+    marginLeft?: string;
+    padding?: string;
+    className?: string;
+    backgroundColor?: ColorOption;
+}
+
+const PlainContainer: React.StatelessComponent<ContainerProps> = ({ children, className }) => (
+    <div className={className}>{children}</div>
+);
+
+export const Container = styled(PlainContainer)`
+    ${props => cssRuleIfExists(props, 'display')}
+    ${props => cssRuleIfExists(props, 'position')}
+    ${props => cssRuleIfExists(props, 'top')}
+    ${props => cssRuleIfExists(props, 'right')}
+    ${props => cssRuleIfExists(props, 'bottom')}
+    ${props => cssRuleIfExists(props, 'left')}
+    ${props => cssRuleIfExists(props, 'max-width')}
+    ${props => cssRuleIfExists(props, 'margin')}
+    ${props => cssRuleIfExists(props, 'margin-top')}
+    ${props => cssRuleIfExists(props, 'margin-right')}
+    ${props => cssRuleIfExists(props, 'margin-bottom')}
+    ${props => cssRuleIfExists(props, 'margin-left')}
+    ${props => cssRuleIfExists(props, 'padding')}
+    background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
+`;
+
+Container.defaultProps = {
+    display: 'inline-block',
+};
diff --git a/packages/instant/src/components/ui/flex.tsx b/packages/instant/src/components/ui/flex.tsx
new file mode 100644
index 000000000..544d9fe23
--- /dev/null
+++ b/packages/instant/src/components/ui/flex.tsx
@@ -0,0 +1,34 @@
+import * as React from 'react';
+
+import { ColorOption, styled } from '../../style/theme';
+
+export interface FlexProps {
+    direction: 'row' | 'column';
+    flexWrap: 'wrap' | 'nowrap';
+    justify: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
+    align: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
+    backgroundColor?: ColorOption;
+    className?: string;
+}
+
+const PlainFlex: React.StatelessComponent<FlexProps> = ({ children, className }) => (
+    <div className={className}>{children}</div>
+);
+
+export const Flex = styled(PlainFlex)`
+    display: flex;
+    direction: ${props => props.direction};
+    flex-wrap: ${props => props.flexWrap};
+    justify-content: ${props => props.justify};
+    align-items: ${props => props.align};
+    background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
+`;
+
+Flex.defaultProps = {
+    direction: 'row',
+    flexWrap: 'nowrap',
+    justify: 'center',
+    align: 'center',
+};
+
+Flex.displayName = 'Flex';
-- 
cgit 


From a8b01fedb1cbe61daf20dc6e0b62ccd7b1bc9b92 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 14:59:07 -0700
Subject: Improve utilities and try to use them in simple form component

---
 packages/instant/src/components/ui/container.tsx   | 10 +++++-
 packages/instant/src/components/ui/flex.tsx        | 10 +++---
 packages/instant/src/components/ui/index.ts        |  4 +++
 packages/instant/src/components/ui/text.tsx        | 35 +++++++++++---------
 .../instant/src/components/zero_ex_instant.tsx     |  4 ++-
 .../src/components/zero_ex_instant_container.tsx   | 38 ++++++++++++++++++++++
 6 files changed, 79 insertions(+), 22 deletions(-)
 create mode 100644 packages/instant/src/components/ui/index.ts
 create mode 100644 packages/instant/src/components/zero_ex_instant_container.tsx

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
index f928ed25b..8366d5748 100644
--- a/packages/instant/src/components/ui/container.tsx
+++ b/packages/instant/src/components/ui/container.tsx
@@ -10,13 +10,16 @@ export interface ContainerProps {
     right?: string;
     bottom?: string;
     left?: string;
+    width?: string;
     maxWidth?: string;
-    margin: string;
+    margin?: string;
     marginTop?: string;
     marginRight?: string;
     marginBottom?: string;
     marginLeft?: string;
     padding?: string;
+    boxShadow?: string;
+    borderRadius?: string;
     className?: string;
     backgroundColor?: ColorOption;
 }
@@ -32,6 +35,7 @@ export const Container = styled(PlainContainer)`
     ${props => cssRuleIfExists(props, 'right')}
     ${props => cssRuleIfExists(props, 'bottom')}
     ${props => cssRuleIfExists(props, 'left')}
+    ${props => cssRuleIfExists(props, 'width')}
     ${props => cssRuleIfExists(props, 'max-width')}
     ${props => cssRuleIfExists(props, 'margin')}
     ${props => cssRuleIfExists(props, 'margin-top')}
@@ -39,9 +43,13 @@ export const Container = styled(PlainContainer)`
     ${props => cssRuleIfExists(props, 'margin-bottom')}
     ${props => cssRuleIfExists(props, 'margin-left')}
     ${props => cssRuleIfExists(props, 'padding')}
+    ${props => cssRuleIfExists(props, 'box-shadow')}
+    ${props => cssRuleIfExists(props, 'border-radius')}
     background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
 `;
 
 Container.defaultProps = {
     display: 'inline-block',
 };
+
+Container.displayName = 'Container';
diff --git a/packages/instant/src/components/ui/flex.tsx b/packages/instant/src/components/ui/flex.tsx
index 544d9fe23..f55f5f8ba 100644
--- a/packages/instant/src/components/ui/flex.tsx
+++ b/packages/instant/src/components/ui/flex.tsx
@@ -3,10 +3,10 @@ import * as React from 'react';
 import { ColorOption, styled } from '../../style/theme';
 
 export interface FlexProps {
-    direction: 'row' | 'column';
-    flexWrap: 'wrap' | 'nowrap';
-    justify: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
-    align: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
+    direction?: 'row' | 'column';
+    flexWrap?: 'wrap' | 'nowrap';
+    justify?: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
+    align?: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
     backgroundColor?: ColorOption;
     className?: string;
 }
@@ -17,7 +17,7 @@ const PlainFlex: React.StatelessComponent<FlexProps> = ({ children, className })
 
 export const Flex = styled(PlainFlex)`
     display: flex;
-    direction: ${props => props.direction};
+    flex-direction: ${props => props.direction};
     flex-wrap: ${props => props.flexWrap};
     justify-content: ${props => props.justify};
     align-items: ${props => props.align};
diff --git a/packages/instant/src/components/ui/index.ts b/packages/instant/src/components/ui/index.ts
new file mode 100644
index 000000000..dca63b65c
--- /dev/null
+++ b/packages/instant/src/components/ui/index.ts
@@ -0,0 +1,4 @@
+export { Text, Title } from './text';
+export { Button } from './button';
+export { Flex } from './flex';
+export { Container } from './container';
diff --git a/packages/instant/src/components/ui/text.tsx b/packages/instant/src/components/ui/text.tsx
index a4b9d60d7..0bc387644 100644
--- a/packages/instant/src/components/ui/text.tsx
+++ b/packages/instant/src/components/ui/text.tsx
@@ -3,16 +3,16 @@ import * as React from 'react';
 
 import { ColorOption, styled } from '../../style/theme';
 
-export type TextTag = 'p' | 'div' | 'span' | 'label' | 'h1' | 'h2' | 'h3' | 'h4' | 'i';
-
 export interface TextProps {
-    fontColor: ColorOption;
-    fontFamily: string;
-    fontStyle: string;
-    fontSize: string;
-    lineHeight: string;
+    fontColor?: ColorOption;
+    fontFamily?: string;
+    fontStyle?: string;
+    fontSize?: string;
+    opacity?: number;
+    letterSpacing?: string;
+    textTransform?: string;
+    lineHeight?: string;
     className?: string;
-    Tag?: TextTag;
     minHeight?: string;
     center?: boolean;
     fontWeight?: number | string;
@@ -23,10 +23,10 @@ export interface TextProps {
     display?: string;
 }
 
-const PlainText: React.StatelessComponent<TextProps> = ({ children, className, onClick, Tag }) => (
-    <Tag className={className} onClick={onClick}>
+const PlainText: React.StatelessComponent<TextProps> = ({ children, className, onClick }) => (
+    <p className={className} onClick={onClick}>
         {children}
-    </Tag>
+    </p>
 );
 
 const darkenOnHoverAmount = 0.3;
@@ -35,17 +35,23 @@ export const Text = styled(PlainText)`
     font-style: ${props => props.fontStyle};
     font-weight: ${props => props.fontWeight};
     font-size: ${props => props.fontSize};
+    opacity: ${props => props.opacity};
     text-decoration-line: ${props => props.textDecorationLine};
     ${props => (props.lineHeight ? `line-height: ${props.lineHeight}` : '')};
     ${props => (props.center ? 'text-align: center' : '')};
-    color: ${props => props.theme[props.fontColor]};
+    color: ${props => props.fontColor && props.theme[props.fontColor]};
     ${props => (props.minHeight ? `min-height: ${props.minHeight}` : '')};
     ${props => (props.onClick ? 'cursor: pointer' : '')};
     transition: color 0.5s ease;
     ${props => (props.noWrap ? 'white-space: nowrap' : '')};
     ${props => (props.display ? `display: ${props.display}` : '')};
+    ${props => (props.letterSpacing ? `letter-spacing: ${props.letterSpacing}` : '')};
+    ${props => (props.textTransform ? `text-transform: ${props.textTransform}` : '')};
     &:hover {
-        ${props => (props.onClick ? `color: ${props.hoverColor || darken(darkenOnHoverAmount, props.fontColor)}` : '')};
+        ${props =>
+            props.onClick
+                ? `color: ${props.hoverColor || darken(darkenOnHoverAmount, props.theme[props.fontColor || 'white'])}`
+                : ''};
     }
 `;
 
@@ -57,7 +63,6 @@ Text.defaultProps = {
     fontSize: '15px',
     lineHeight: '1.5em',
     textDecorationLine: 'none',
-    Tag: 'div',
     noWrap: false,
 };
 
@@ -66,9 +71,9 @@ Text.displayName = 'Text';
 export const Title: React.StatelessComponent<TextProps> = props => <Text {...props} />;
 
 Title.defaultProps = {
-    Tag: 'h2',
     fontSize: '20px',
     fontWeight: 600,
+    opacity: 1,
     fontColor: ColorOption.primaryColor,
 };
 
diff --git a/packages/instant/src/components/zero_ex_instant.tsx b/packages/instant/src/components/zero_ex_instant.tsx
index 99f9bb3ba..0e6230d1b 100644
--- a/packages/instant/src/components/zero_ex_instant.tsx
+++ b/packages/instant/src/components/zero_ex_instant.tsx
@@ -5,6 +5,8 @@ import { store } from '../redux/store';
 import { fonts } from '../style/fonts';
 import { theme, ThemeProvider } from '../style/theme';
 
+import { ZeroExInstantContainer } from './zero_ex_instant_container';
+
 fonts.include();
 
 export interface ZeroExInstantProps {}
@@ -12,7 +14,7 @@ export interface ZeroExInstantProps {}
 export const ZeroExInstant: React.StatelessComponent<ZeroExInstantProps> = () => (
     <Provider store={store}>
         <ThemeProvider theme={theme}>
-            <div> ZeroExInstant </div>
+            <ZeroExInstantContainer />
         </ThemeProvider>
     </Provider>
 );
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx
new file mode 100644
index 000000000..fc936c3f2
--- /dev/null
+++ b/packages/instant/src/components/zero_ex_instant_container.tsx
@@ -0,0 +1,38 @@
+import * as React from 'react';
+
+import { ColorOption } from '../style/theme';
+
+import { Container, Flex, Text } from './ui';
+
+export interface ZeroExInstantContainerProps {}
+
+export const ZeroExInstantContainer: React.StatelessComponent<ZeroExInstantContainerProps> = props => (
+    <Container width="350px" borderRadius="3px">
+        <Flex direction="column">
+            <Container backgroundColor={ColorOption.primaryColor} padding="20px">
+                <Text
+                    letterSpacing="1px"
+                    fontColor={ColorOption.white}
+                    opacity={0.7}
+                    fontWeight={600}
+                    textTransform="uppercase"
+                >
+                    I want to buy
+                </Text>
+                <Flex direction="row" justify="space-between">
+                    <Container>
+                        <Text textTransform="uppercase">0.00</Text>
+                        <Text textTransform="uppercase"> rep </Text>
+                    </Container>
+                    <Flex direction="column">
+                        <Text> 0 ETH </Text>
+                        <Text> $0.00 </Text>
+                    </Flex>
+                </Flex>
+            </Container>
+            <Container padding="20px" backgroundColor={ColorOption.white}>
+                <Text>hey</Text>
+            </Container>
+        </Flex>
+    </Container>
+);
-- 
cgit 


From 0cfe5637c048091c9502d49c8526e17cefb1a525 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 16:27:04 -0700
Subject: Create zrx instant container heading

---
 packages/instant/src/components/ui/flex.tsx        |  3 ++
 packages/instant/src/components/ui/text.tsx        |  6 +--
 .../src/components/zero_ex_instant_container.tsx   | 49 ++++++++++++++--------
 3 files changed, 37 insertions(+), 21 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/ui/flex.tsx b/packages/instant/src/components/ui/flex.tsx
index f55f5f8ba..327e91926 100644
--- a/packages/instant/src/components/ui/flex.tsx
+++ b/packages/instant/src/components/ui/flex.tsx
@@ -1,12 +1,14 @@
 import * as React from 'react';
 
 import { ColorOption, styled } from '../../style/theme';
+import { cssRuleIfExists } from '../../style/util';
 
 export interface FlexProps {
     direction?: 'row' | 'column';
     flexWrap?: 'wrap' | 'nowrap';
     justify?: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
     align?: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
+    width?: string;
     backgroundColor?: ColorOption;
     className?: string;
 }
@@ -21,6 +23,7 @@ export const Flex = styled(PlainFlex)`
     flex-wrap: ${props => props.flexWrap};
     justify-content: ${props => props.justify};
     align-items: ${props => props.align};
+    ${props => cssRuleIfExists(props, 'width')}
     background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
 `;
 
diff --git a/packages/instant/src/components/ui/text.tsx b/packages/instant/src/components/ui/text.tsx
index 0bc387644..9fb8ea26f 100644
--- a/packages/instant/src/components/ui/text.tsx
+++ b/packages/instant/src/components/ui/text.tsx
@@ -24,9 +24,9 @@ export interface TextProps {
 }
 
 const PlainText: React.StatelessComponent<TextProps> = ({ children, className, onClick }) => (
-    <p className={className} onClick={onClick}>
+    <div className={className} onClick={onClick}>
         {children}
-    </p>
+    </div>
 );
 
 const darkenOnHoverAmount = 0.3;
@@ -61,9 +61,9 @@ Text.defaultProps = {
     fontWeight: 400,
     fontColor: ColorOption.black,
     fontSize: '15px',
-    lineHeight: '1.5em',
     textDecorationLine: 'none',
     noWrap: false,
+    display: 'inline-block',
 };
 
 Text.displayName = 'Text';
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx
index fc936c3f2..b5853594f 100644
--- a/packages/instant/src/components/zero_ex_instant_container.tsx
+++ b/packages/instant/src/components/zero_ex_instant_container.tsx
@@ -7,32 +7,45 @@ import { Container, Flex, Text } from './ui';
 export interface ZeroExInstantContainerProps {}
 
 export const ZeroExInstantContainer: React.StatelessComponent<ZeroExInstantContainerProps> = props => (
-    <Container width="350px" borderRadius="3px">
-        <Flex direction="column">
-            <Container backgroundColor={ColorOption.primaryColor} padding="20px">
+    <Flex direction="column" width="350px" justify="flex-start">
+        <Container backgroundColor={ColorOption.primaryColor} padding="20px" width="100%">
+            <Container marginBottom="5px">
                 <Text
                     letterSpacing="1px"
                     fontColor={ColorOption.white}
                     opacity={0.7}
-                    fontWeight={600}
+                    fontWeight={500}
                     textTransform="uppercase"
+                    fontSize="12px"
                 >
                     I want to buy
                 </Text>
-                <Flex direction="row" justify="space-between">
-                    <Container>
-                        <Text textTransform="uppercase">0.00</Text>
-                        <Text textTransform="uppercase"> rep </Text>
+            </Container>
+            <Flex direction="row" justify="space-between">
+                <Container>
+                    <Text fontSize="45px" fontColor={ColorOption.white} opacity={0.7} textTransform="uppercase">
+                        0.00
+                    </Text>
+                    <Container display="inline-block" marginLeft="10px">
+                        <Text fontSize="45px" fontColor={ColorOption.white} textTransform="uppercase">
+                            rep
+                        </Text>
+                    </Container>
+                </Container>
+                <Flex direction="column" justify="space-between">
+                    <Container marginBottom="5px">
+                        <Text fontSize="16px" fontColor={ColorOption.white} fontWeight={500}>
+                            0 ETH
+                        </Text>
                     </Container>
-                    <Flex direction="column">
-                        <Text> 0 ETH </Text>
-                        <Text> $0.00 </Text>
-                    </Flex>
+                    <Text fontSize="16px" fontColor={ColorOption.white} opacity={0.7}>
+                        $0.00
+                    </Text>
                 </Flex>
-            </Container>
-            <Container padding="20px" backgroundColor={ColorOption.white}>
-                <Text>hey</Text>
-            </Container>
-        </Flex>
-    </Container>
+            </Flex>
+        </Container>
+        <Container padding="20px" backgroundColor={ColorOption.white} width="100%">
+            <Text>hey</Text>
+        </Container>
+    </Flex>
 );
-- 
cgit 


From d9b7aa2e4ba088b4dda1b1d2956de5d267a0674e Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 17:22:36 -0700
Subject: Add faux order details section

---
 packages/instant/src/components/ui/container.tsx   |  8 +++-
 .../src/components/zero_ex_instant_container.tsx   | 43 ++--------------------
 2 files changed, 11 insertions(+), 40 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
index 8366d5748..4ebaf2af3 100644
--- a/packages/instant/src/components/ui/container.tsx
+++ b/packages/instant/src/components/ui/container.tsx
@@ -20,6 +20,9 @@ export interface ContainerProps {
     padding?: string;
     boxShadow?: string;
     borderRadius?: string;
+    border?: string;
+    borderColor?: ColorOption;
+    borderTop?: string;
     className?: string;
     backgroundColor?: ColorOption;
 }
@@ -45,11 +48,14 @@ export const Container = styled(PlainContainer)`
     ${props => cssRuleIfExists(props, 'padding')}
     ${props => cssRuleIfExists(props, 'box-shadow')}
     ${props => cssRuleIfExists(props, 'border-radius')}
+    ${props => cssRuleIfExists(props, 'border')}
+    ${props => cssRuleIfExists(props, 'border-top')}
     background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
+    border-color: ${props => (props.borderColor ? props.theme[props.borderColor] : 'none')};
 `;
 
 Container.defaultProps = {
-    display: 'inline-block',
+    display: 'block',
 };
 
 Container.displayName = 'Container';
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx
index b5853594f..efda6ecaf 100644
--- a/packages/instant/src/components/zero_ex_instant_container.tsx
+++ b/packages/instant/src/components/zero_ex_instant_container.tsx
@@ -2,50 +2,15 @@ import * as React from 'react';
 
 import { ColorOption } from '../style/theme';
 
+import { InstantHeading } from './instant_heading';
+import { OrderDetails } from './order_details';
 import { Container, Flex, Text } from './ui';
 
 export interface ZeroExInstantContainerProps {}
 
 export const ZeroExInstantContainer: React.StatelessComponent<ZeroExInstantContainerProps> = props => (
     <Flex direction="column" width="350px" justify="flex-start">
-        <Container backgroundColor={ColorOption.primaryColor} padding="20px" width="100%">
-            <Container marginBottom="5px">
-                <Text
-                    letterSpacing="1px"
-                    fontColor={ColorOption.white}
-                    opacity={0.7}
-                    fontWeight={500}
-                    textTransform="uppercase"
-                    fontSize="12px"
-                >
-                    I want to buy
-                </Text>
-            </Container>
-            <Flex direction="row" justify="space-between">
-                <Container>
-                    <Text fontSize="45px" fontColor={ColorOption.white} opacity={0.7} textTransform="uppercase">
-                        0.00
-                    </Text>
-                    <Container display="inline-block" marginLeft="10px">
-                        <Text fontSize="45px" fontColor={ColorOption.white} textTransform="uppercase">
-                            rep
-                        </Text>
-                    </Container>
-                </Container>
-                <Flex direction="column" justify="space-between">
-                    <Container marginBottom="5px">
-                        <Text fontSize="16px" fontColor={ColorOption.white} fontWeight={500}>
-                            0 ETH
-                        </Text>
-                    </Container>
-                    <Text fontSize="16px" fontColor={ColorOption.white} opacity={0.7}>
-                        $0.00
-                    </Text>
-                </Flex>
-            </Flex>
-        </Container>
-        <Container padding="20px" backgroundColor={ColorOption.white} width="100%">
-            <Text>hey</Text>
-        </Container>
+        <InstantHeading />
+        <OrderDetails />
     </Flex>
 );
-- 
cgit 


From 98f8c7749433e63d7fea3c4e932db1f251607e4d Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 17:47:32 -0700
Subject: Add BuyButton and other small improvement

---
 packages/instant/src/components/buy_button.tsx     | 19 +++++++
 .../instant/src/components/instant_heading.tsx     | 46 ++++++++++++++++
 packages/instant/src/components/order_details.tsx  | 62 ++++++++++++++++++++++
 packages/instant/src/components/ui/button.tsx      | 26 ++++-----
 packages/instant/src/components/ui/container.tsx   |  2 +
 .../src/components/zero_ex_instant_container.tsx   |  2 +
 6 files changed, 140 insertions(+), 17 deletions(-)
 create mode 100644 packages/instant/src/components/buy_button.tsx
 create mode 100644 packages/instant/src/components/instant_heading.tsx
 create mode 100644 packages/instant/src/components/order_details.tsx

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/buy_button.tsx b/packages/instant/src/components/buy_button.tsx
new file mode 100644
index 000000000..9a70d127f
--- /dev/null
+++ b/packages/instant/src/components/buy_button.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react';
+
+import { ColorOption } from '../style/theme';
+
+import { Button, Container, Text } from './ui';
+
+export interface BuyButtonProps {}
+
+export const BuyButton: React.StatelessComponent<BuyButtonProps> = props => (
+    <Container backgroundColor={ColorOption.white} padding="20px" width="100%">
+        <Button width="100%">
+            <Text fontColor={ColorOption.white} fontWeight={600} fontSize="20px">
+                Buy
+            </Text>
+        </Button>
+    </Container>
+);
+
+BuyButton.displayName = 'BuyButton';
diff --git a/packages/instant/src/components/instant_heading.tsx b/packages/instant/src/components/instant_heading.tsx
new file mode 100644
index 000000000..5aa82bcda
--- /dev/null
+++ b/packages/instant/src/components/instant_heading.tsx
@@ -0,0 +1,46 @@
+import * as React from 'react';
+
+import { ColorOption } from '../style/theme';
+
+import { Container, Flex, Text } from './ui';
+
+export interface InstantHeadingProps {}
+
+export const InstantHeading: React.StatelessComponent<InstantHeadingProps> = props => (
+    <Container backgroundColor={ColorOption.primaryColor} padding="20px" width="100%">
+        <Container marginBottom="5px">
+            <Text
+                letterSpacing="1px"
+                fontColor={ColorOption.white}
+                opacity={0.7}
+                fontWeight={500}
+                textTransform="uppercase"
+                fontSize="12px"
+            >
+                I want to buy
+            </Text>
+        </Container>
+        <Flex direction="row" justify="space-between">
+            <Container>
+                <Text fontSize="45px" fontColor={ColorOption.white} opacity={0.7} textTransform="uppercase">
+                    0.00
+                </Text>
+                <Container display="inline-block" marginLeft="10px">
+                    <Text fontSize="45px" fontColor={ColorOption.white} textTransform="uppercase">
+                        rep
+                    </Text>
+                </Container>
+            </Container>
+            <Flex direction="column" justify="space-between">
+                <Container marginBottom="5px">
+                    <Text fontSize="16px" fontColor={ColorOption.white} fontWeight={500}>
+                        0 ETH
+                    </Text>
+                </Container>
+                <Text fontSize="16px" fontColor={ColorOption.white} opacity={0.7}>
+                    $0.00
+                </Text>
+            </Flex>
+        </Flex>
+    </Container>
+);
diff --git a/packages/instant/src/components/order_details.tsx b/packages/instant/src/components/order_details.tsx
new file mode 100644
index 000000000..f90ee9f6f
--- /dev/null
+++ b/packages/instant/src/components/order_details.tsx
@@ -0,0 +1,62 @@
+import * as React from 'react';
+
+import { ColorOption } from '../style/theme';
+
+import { Container, Flex, Text } from './ui';
+
+export interface OrderDetailsProps {}
+
+export const OrderDetails: React.StatelessComponent<OrderDetailsProps> = props => (
+    <Container backgroundColor={ColorOption.white} padding="20px" width="100%">
+        <Container marginBottom="10px">
+            <Text
+                letterSpacing="1px"
+                fontColor={ColorOption.primaryColor}
+                fontWeight={600}
+                textTransform="uppercase"
+                fontSize="14px"
+            >
+                Order Details
+            </Text>
+        </Container>
+        <OrderDetailsRow name="Token Price" primaryValue=".013 ETH" secondaryValue="$24.32" />
+        <OrderDetailsRow name="Fee" primaryValue=".005 ETH" secondaryValue="$1.04" />
+        <OrderDetailsRow name="Total Cost" primaryValue="1.66 ETH" secondaryValue="$589.56" shouldEmphasize={true} />
+    </Container>
+);
+
+OrderDetails.displayName = 'OrderDetails';
+
+export interface OrderDetailsRowProps {
+    name: string;
+    primaryValue: string;
+    secondaryValue: string;
+    shouldEmphasize?: boolean;
+}
+
+export const OrderDetailsRow: React.StatelessComponent<OrderDetailsRowProps> = props => {
+    const fontWeight = props.shouldEmphasize ? 700 : 400;
+    return (
+        <Container padding="10px 0px" borderTop="1px dashed" borderColor={ColorOption.feintGrey}>
+            <Flex justify="space-between">
+                <Text fontWeight={fontWeight} fontColor={ColorOption.grey}>
+                    {props.name}
+                </Text>
+                <Container>
+                    <Container marginRight="3px" display="inline-block">
+                        <Text fontColor={ColorOption.lightGrey}>({props.secondaryValue}) </Text>
+                    </Container>
+                    <Text fontWeight={fontWeight} fontColor={ColorOption.grey}>
+                        {props.primaryValue}
+                    </Text>
+                </Container>
+            </Flex>
+        </Container>
+    );
+};
+
+OrderDetailsRow.defaultProps = {
+    shouldEmphasize: false,
+};
+
+OrderDetailsRow.displayName = 'OrderDetailsRow';
diff --git a/packages/instant/src/components/ui/button.tsx b/packages/instant/src/components/ui/button.tsx
index ec0a87345..1fcb2591c 100644
--- a/packages/instant/src/components/ui/button.tsx
+++ b/packages/instant/src/components/ui/button.tsx
@@ -4,11 +4,8 @@ import * as React from 'react';
 import { ColorOption, styled } from '../../style/theme';
 
 export interface ButtonProps {
-    fontColor: ColorOption;
-    backgroundColor: ColorOption;
+    backgroundColor?: ColorOption;
     borderColor?: ColorOption;
-    fontSize?: string;
-    fontFamily?: string;
     width?: string;
     padding?: string;
     type?: string;
@@ -28,41 +25,36 @@ const darkenOnActiveAmount = 0.2;
 const saturateOnFocusAmount = 0.2;
 export const Button = styled(PlainButton)`
     cursor: ${props => (props.isDisabled ? 'default' : 'pointer')};
-    font-size: ${props => props.fontSize};
-    color: ${props => props.fontColor};
     transition: background-color, opacity 0.5s ease;
     padding: ${props => props.padding};
-    border-radius: 6px;
-    font-weight: 500;
+    border-radius: 3px;
     outline: none;
-    font-family: ${props => props.fontFamily};
     width: ${props => props.width};
-    background-color: ${props => props.backgroundColor};
+    background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
     border: ${props => (props.borderColor ? `1px solid ${props.theme[props.borderColor]}` : 'none')};
     &:hover {
         background-color: ${props =>
-            !props.isDisabled ? darken(darkenOnHoverAmount, props.theme[props.backgroundColor]) : ''} !important;
+            !props.isDisabled
+                ? darken(darkenOnHoverAmount, props.theme[props.backgroundColor || 'white'])
+                : ''} !important;
     }
     &:active {
         background-color: ${props =>
-            !props.isDisabled ? darken(darkenOnActiveAmount, props.theme[props.backgroundColor]) : ''};
+            !props.isDisabled ? darken(darkenOnActiveAmount, props.theme[props.backgroundColor || 'white']) : ''};
     }
     &:disabled {
         opacity: 0.5;
     }
     &:focus {
-        background-color: ${props => saturate(saturateOnFocusAmount, props.theme[props.backgroundColor])};
+        background-color: ${props => saturate(saturateOnFocusAmount, props.theme[props.backgroundColor || 'white'])};
     }
 `;
 
 Button.defaultProps = {
-    fontSize: '12px',
-    fontColor: ColorOption.white,
     backgroundColor: ColorOption.primaryColor,
     width: 'auto',
-    fontFamily: 'Inter UI',
     isDisabled: false,
-    padding: '0.8em 2.2em',
+    padding: '1em 2.2em',
 };
 
 Button.displayName = 'Button';
diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
index 4ebaf2af3..bc47ba0aa 100644
--- a/packages/instant/src/components/ui/container.tsx
+++ b/packages/instant/src/components/ui/container.tsx
@@ -25,6 +25,7 @@ export interface ContainerProps {
     borderTop?: string;
     className?: string;
     backgroundColor?: ColorOption;
+    hasBoxShadow?: boolean;
 }
 
 const PlainContainer: React.StatelessComponent<ContainerProps> = ({ children, className }) => (
@@ -50,6 +51,7 @@ export const Container = styled(PlainContainer)`
     ${props => cssRuleIfExists(props, 'border-radius')}
     ${props => cssRuleIfExists(props, 'border')}
     ${props => cssRuleIfExists(props, 'border-top')}
+    ${props => (props.hasBoxShadow ? `box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1)` : '')};
     background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
     border-color: ${props => (props.borderColor ? props.theme[props.borderColor] : 'none')};
 `;
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx
index efda6ecaf..d6df3ccc0 100644
--- a/packages/instant/src/components/zero_ex_instant_container.tsx
+++ b/packages/instant/src/components/zero_ex_instant_container.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 
 import { ColorOption } from '../style/theme';
 
+import { BuyButton } from './buy_button';
 import { InstantHeading } from './instant_heading';
 import { OrderDetails } from './order_details';
 import { Container, Flex, Text } from './ui';
@@ -12,5 +13,6 @@ export const ZeroExInstantContainer: React.StatelessComponent<ZeroExInstantConta
     <Flex direction="column" width="350px" justify="flex-start">
         <InstantHeading />
         <OrderDetails />
+        <BuyButton />
     </Flex>
 );
-- 
cgit 


From 1001dfcc30d9e7a049cc0d7719131adec6344f6c Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 18:02:42 -0700
Subject: Add box shadow and default box-sizing: border-box to container

---
 packages/instant/src/components/buy_button.tsx               |  2 +-
 packages/instant/src/components/order_details.tsx            |  2 +-
 packages/instant/src/components/ui/container.tsx             |  3 +--
 .../instant/src/components/zero_ex_instant_container.tsx     | 12 +++++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/buy_button.tsx b/packages/instant/src/components/buy_button.tsx
index 9a70d127f..5a32b9575 100644
--- a/packages/instant/src/components/buy_button.tsx
+++ b/packages/instant/src/components/buy_button.tsx
@@ -7,7 +7,7 @@ import { Button, Container, Text } from './ui';
 export interface BuyButtonProps {}
 
 export const BuyButton: React.StatelessComponent<BuyButtonProps> = props => (
-    <Container backgroundColor={ColorOption.white} padding="20px" width="100%">
+    <Container padding="20px" width="100%">
         <Button width="100%">
             <Text fontColor={ColorOption.white} fontWeight={600} fontSize="20px">
                 Buy
diff --git a/packages/instant/src/components/order_details.tsx b/packages/instant/src/components/order_details.tsx
index f90ee9f6f..dbf2c1f0b 100644
--- a/packages/instant/src/components/order_details.tsx
+++ b/packages/instant/src/components/order_details.tsx
@@ -7,7 +7,7 @@ import { Container, Flex, Text } from './ui';
 export interface OrderDetailsProps {}
 
 export const OrderDetails: React.StatelessComponent<OrderDetailsProps> = props => (
-    <Container backgroundColor={ColorOption.white} padding="20px" width="100%">
+    <Container padding="20px" width="100%">
         <Container marginBottom="10px">
             <Text
                 letterSpacing="1px"
diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
index bc47ba0aa..64b5d4129 100644
--- a/packages/instant/src/components/ui/container.tsx
+++ b/packages/instant/src/components/ui/container.tsx
@@ -18,7 +18,6 @@ export interface ContainerProps {
     marginBottom?: string;
     marginLeft?: string;
     padding?: string;
-    boxShadow?: string;
     borderRadius?: string;
     border?: string;
     borderColor?: ColorOption;
@@ -33,6 +32,7 @@ const PlainContainer: React.StatelessComponent<ContainerProps> = ({ children, cl
 );
 
 export const Container = styled(PlainContainer)`
+    box-sizing: border-box;
     ${props => cssRuleIfExists(props, 'display')}
     ${props => cssRuleIfExists(props, 'position')}
     ${props => cssRuleIfExists(props, 'top')}
@@ -47,7 +47,6 @@ export const Container = styled(PlainContainer)`
     ${props => cssRuleIfExists(props, 'margin-bottom')}
     ${props => cssRuleIfExists(props, 'margin-left')}
     ${props => cssRuleIfExists(props, 'padding')}
-    ${props => cssRuleIfExists(props, 'box-shadow')}
     ${props => cssRuleIfExists(props, 'border-radius')}
     ${props => cssRuleIfExists(props, 'border')}
     ${props => cssRuleIfExists(props, 'border-top')}
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx
index d6df3ccc0..d33b4bfd5 100644
--- a/packages/instant/src/components/zero_ex_instant_container.tsx
+++ b/packages/instant/src/components/zero_ex_instant_container.tsx
@@ -10,9 +10,11 @@ import { Container, Flex, Text } from './ui';
 export interface ZeroExInstantContainerProps {}
 
 export const ZeroExInstantContainer: React.StatelessComponent<ZeroExInstantContainerProps> = props => (
-    <Flex direction="column" width="350px" justify="flex-start">
-        <InstantHeading />
-        <OrderDetails />
-        <BuyButton />
-    </Flex>
+    <Container hasBoxShadow={true} width="350px" backgroundColor={ColorOption.white}>
+        <Flex direction="column" justify="flex-start">
+            <InstantHeading />
+            <OrderDetails />
+            <BuyButton />
+        </Flex>
+    </Container>
 );
-- 
cgit 


From bf0437324d3499dbb516e85a4eb1fbdceb91707c Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 18:06:19 -0700
Subject: Add border radios

---
 packages/instant/src/components/instant_heading.tsx           | 2 +-
 packages/instant/src/components/zero_ex_instant_container.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/instant_heading.tsx b/packages/instant/src/components/instant_heading.tsx
index 5aa82bcda..52c4bb2db 100644
--- a/packages/instant/src/components/instant_heading.tsx
+++ b/packages/instant/src/components/instant_heading.tsx
@@ -7,7 +7,7 @@ import { Container, Flex, Text } from './ui';
 export interface InstantHeadingProps {}
 
 export const InstantHeading: React.StatelessComponent<InstantHeadingProps> = props => (
-    <Container backgroundColor={ColorOption.primaryColor} padding="20px" width="100%">
+    <Container backgroundColor={ColorOption.primaryColor} padding="20px" width="100%" borderRadius="3px 3px 0px 0px">
         <Container marginBottom="5px">
             <Text
                 letterSpacing="1px"
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx
index d33b4bfd5..6075a5b21 100644
--- a/packages/instant/src/components/zero_ex_instant_container.tsx
+++ b/packages/instant/src/components/zero_ex_instant_container.tsx
@@ -10,7 +10,7 @@ import { Container, Flex, Text } from './ui';
 export interface ZeroExInstantContainerProps {}
 
 export const ZeroExInstantContainer: React.StatelessComponent<ZeroExInstantContainerProps> = props => (
-    <Container hasBoxShadow={true} width="350px" backgroundColor={ColorOption.white}>
+    <Container hasBoxShadow={true} width="350px" backgroundColor={ColorOption.white} borderRadius="3px">
         <Flex direction="column" justify="flex-start">
             <InstantHeading />
             <OrderDetails />
-- 
cgit 


From c5084f023ac0356660b9480f9e1f477001a61284 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 18:57:40 -0700
Subject: Add Input and AmountInput component

---
 packages/instant/src/components/amount_input.tsx   | 27 ++++++++++++++
 .../instant/src/components/instant_heading.tsx     |  6 ++--
 packages/instant/src/components/ui/container.tsx   |  2 ++
 packages/instant/src/components/ui/index.ts        |  1 +
 packages/instant/src/components/ui/input.tsx       | 42 ++++++++++++++++++++++
 5 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 packages/instant/src/components/amount_input.tsx
 create mode 100644 packages/instant/src/components/ui/input.tsx

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/amount_input.tsx b/packages/instant/src/components/amount_input.tsx
new file mode 100644
index 000000000..699541bfb
--- /dev/null
+++ b/packages/instant/src/components/amount_input.tsx
@@ -0,0 +1,27 @@
+import { BigNumber } from '@0xproject/utils';
+import * as React from 'react';
+
+import { ColorOption } from '../style/theme';
+
+import { Container, Flex, Input, Text } from './ui';
+
+export interface AmountInputProps {
+    fontColor?: ColorOption;
+    fontSize?: string;
+    value?: BigNumber;
+    onChange?: (value: BigNumber) => void;
+}
+
+export const AmountInput: React.StatelessComponent<AmountInputProps> = props => (
+    <Container borderBottom="1px solid rgba(255,255,255,0.3)" display="inline-block">
+        <Input
+            fontColor={props.fontColor}
+            fontSize={props.fontSize}
+            value={props.value ? props.value.toString() : undefined}
+            placeholder="0.00"
+            width="2em"
+        />
+    </Container>
+);
+
+AmountInput.defaultProps = {};
diff --git a/packages/instant/src/components/instant_heading.tsx b/packages/instant/src/components/instant_heading.tsx
index 52c4bb2db..3da280652 100644
--- a/packages/instant/src/components/instant_heading.tsx
+++ b/packages/instant/src/components/instant_heading.tsx
@@ -1,7 +1,9 @@
+import { BigNumber } from '@0xproject/utils';
 import * as React from 'react';
 
 import { ColorOption } from '../style/theme';
 
+import { AmountInput } from './amount_input';
 import { Container, Flex, Text } from './ui';
 
 export interface InstantHeadingProps {}
@@ -22,9 +24,7 @@ export const InstantHeading: React.StatelessComponent<InstantHeadingProps> = pro
         </Container>
         <Flex direction="row" justify="space-between">
             <Container>
-                <Text fontSize="45px" fontColor={ColorOption.white} opacity={0.7} textTransform="uppercase">
-                    0.00
-                </Text>
+                <AmountInput fontSize="45px" />
                 <Container display="inline-block" marginLeft="10px">
                     <Text fontSize="45px" fontColor={ColorOption.white} textTransform="uppercase">
                         rep
diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
index 64b5d4129..c45f6e5e9 100644
--- a/packages/instant/src/components/ui/container.tsx
+++ b/packages/instant/src/components/ui/container.tsx
@@ -22,6 +22,7 @@ export interface ContainerProps {
     border?: string;
     borderColor?: ColorOption;
     borderTop?: string;
+    borderBottom?: string;
     className?: string;
     backgroundColor?: ColorOption;
     hasBoxShadow?: boolean;
@@ -50,6 +51,7 @@ export const Container = styled(PlainContainer)`
     ${props => cssRuleIfExists(props, 'border-radius')}
     ${props => cssRuleIfExists(props, 'border')}
     ${props => cssRuleIfExists(props, 'border-top')}
+    ${props => cssRuleIfExists(props, 'border-bottom')}
     ${props => (props.hasBoxShadow ? `box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1)` : '')};
     background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
     border-color: ${props => (props.borderColor ? props.theme[props.borderColor] : 'none')};
diff --git a/packages/instant/src/components/ui/index.ts b/packages/instant/src/components/ui/index.ts
index dca63b65c..bf5f6c700 100644
--- a/packages/instant/src/components/ui/index.ts
+++ b/packages/instant/src/components/ui/index.ts
@@ -2,3 +2,4 @@ export { Text, Title } from './text';
 export { Button } from './button';
 export { Flex } from './flex';
 export { Container } from './container';
+export { Input } from './input';
diff --git a/packages/instant/src/components/ui/input.tsx b/packages/instant/src/components/ui/input.tsx
new file mode 100644
index 000000000..fc4fed14e
--- /dev/null
+++ b/packages/instant/src/components/ui/input.tsx
@@ -0,0 +1,42 @@
+import * as React from 'react';
+
+import { ColorOption, styled } from '../../style/theme';
+
+import { Container, Flex, Text } from '../ui';
+
+export interface InputProps {
+    className?: string;
+    value?: string;
+    width?: string;
+    fontSize?: string;
+    fontColor?: ColorOption;
+    placeholder?: string;
+    onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
+}
+
+const PlainInput: React.StatelessComponent<InputProps> = ({ value, className, placeholder, onChange }) => (
+    <input className={className} value={value} onChange={onChange} placeholder={placeholder} />
+);
+
+export const Input = styled(PlainInput)`
+    font-size: ${props => props.fontSize};
+    width: ${props => props.width};
+    padding: 0.1em 0em;
+    font-family: 'Inter UI';
+    color: ${props => props.theme[props.fontColor || 'white']};
+    background: transparent;
+    outline: none;
+    border: none;
+    &::placeholder {
+        color: ${props => props.theme[props.fontColor || 'white']};
+        opacity: 0.5;
+    }
+`;
+
+Input.defaultProps = {
+    width: 'auto',
+    fontColor: ColorOption.white,
+    fontSize: '12px',
+};
+
+Input.displayName = 'Input';
-- 
cgit 


From 1eb8d17ce36274093583069aab0025768a4a91ce Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 19:24:10 -0700
Subject: Create SelectedAssetInputAmount

---
 packages/instant/src/components/amount_input.tsx   | 37 ++++++++++++++--------
 .../instant/src/components/instant_heading.tsx     |  4 +--
 2 files changed, 26 insertions(+), 15 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/amount_input.tsx b/packages/instant/src/components/amount_input.tsx
index 699541bfb..8fead78ca 100644
--- a/packages/instant/src/components/amount_input.tsx
+++ b/packages/instant/src/components/amount_input.tsx
@@ -1,4 +1,5 @@
 import { BigNumber } from '@0xproject/utils';
+import * as _ from 'lodash';
 import * as React from 'react';
 
 import { ColorOption } from '../style/theme';
@@ -12,16 +13,26 @@ export interface AmountInputProps {
     onChange?: (value: BigNumber) => void;
 }
 
-export const AmountInput: React.StatelessComponent<AmountInputProps> = props => (
-    <Container borderBottom="1px solid rgba(255,255,255,0.3)" display="inline-block">
-        <Input
-            fontColor={props.fontColor}
-            fontSize={props.fontSize}
-            value={props.value ? props.value.toString() : undefined}
-            placeholder="0.00"
-            width="2em"
-        />
-    </Container>
-);
-
-AmountInput.defaultProps = {};
+export class AmountInput extends React.Component<AmountInputProps> {
+    public render(): React.ReactNode {
+        const { fontColor, fontSize, value } = this.props;
+        return (
+            <Container borderBottom="1px solid rgba(255,255,255,0.3)" display="inline-block">
+                <Input
+                    fontColor={fontColor}
+                    fontSize={fontSize}
+                    onChange={this._handleChange}
+                    value={value ? value.toString() : undefined}
+                    placeholder="0.00"
+                    width="2em"
+                />
+            </Container>
+        );
+    }
+    private _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
+        const bigNumberValue = new BigNumber(event.target.value);
+        if (!_.isUndefined(this.props.onChange)) {
+            this.props.onChange(bigNumberValue);
+        }
+    };
+}
diff --git a/packages/instant/src/components/instant_heading.tsx b/packages/instant/src/components/instant_heading.tsx
index 3da280652..2b07ef666 100644
--- a/packages/instant/src/components/instant_heading.tsx
+++ b/packages/instant/src/components/instant_heading.tsx
@@ -1,9 +1,9 @@
 import { BigNumber } from '@0xproject/utils';
 import * as React from 'react';
 
+import { SelectedAssetAmountInput } from '../containers/selected_asset_amount_input';
 import { ColorOption } from '../style/theme';
 
-import { AmountInput } from './amount_input';
 import { Container, Flex, Text } from './ui';
 
 export interface InstantHeadingProps {}
@@ -24,7 +24,7 @@ export const InstantHeading: React.StatelessComponent<InstantHeadingProps> = pro
         </Container>
         <Flex direction="row" justify="space-between">
             <Container>
-                <AmountInput fontSize="45px" />
+                <SelectedAssetAmountInput fontSize="45px" />
                 <Container display="inline-block" marginLeft="10px">
                     <Text fontSize="45px" fontColor={ColorOption.white} textTransform="uppercase">
                         rep
-- 
cgit 


From d7b6d8222f459942f82338fee752d03fe2d1547a Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 4 Oct 2018 19:32:33 -0700
Subject: Apply linter

---
 packages/instant/src/components/amount_input.tsx              | 6 +++---
 packages/instant/src/components/instant_heading.tsx           | 1 -
 packages/instant/src/components/ui/input.tsx                  | 2 --
 packages/instant/src/components/zero_ex_instant_container.tsx | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/amount_input.tsx b/packages/instant/src/components/amount_input.tsx
index 8fead78ca..2b64469f6 100644
--- a/packages/instant/src/components/amount_input.tsx
+++ b/packages/instant/src/components/amount_input.tsx
@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import { ColorOption } from '../style/theme';
 
-import { Container, Flex, Input, Text } from './ui';
+import { Container, Input } from './ui';
 
 export interface AmountInputProps {
     fontColor?: ColorOption;
@@ -29,10 +29,10 @@ export class AmountInput extends React.Component<AmountInputProps> {
             </Container>
         );
     }
-    private _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
+    private readonly _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
         const bigNumberValue = new BigNumber(event.target.value);
         if (!_.isUndefined(this.props.onChange)) {
             this.props.onChange(bigNumberValue);
         }
-    };
+    }
 }
diff --git a/packages/instant/src/components/instant_heading.tsx b/packages/instant/src/components/instant_heading.tsx
index 2b07ef666..be0414b8d 100644
--- a/packages/instant/src/components/instant_heading.tsx
+++ b/packages/instant/src/components/instant_heading.tsx
@@ -1,4 +1,3 @@
-import { BigNumber } from '@0xproject/utils';
 import * as React from 'react';
 
 import { SelectedAssetAmountInput } from '../containers/selected_asset_amount_input';
diff --git a/packages/instant/src/components/ui/input.tsx b/packages/instant/src/components/ui/input.tsx
index fc4fed14e..f8c6b6ef6 100644
--- a/packages/instant/src/components/ui/input.tsx
+++ b/packages/instant/src/components/ui/input.tsx
@@ -2,8 +2,6 @@ import * as React from 'react';
 
 import { ColorOption, styled } from '../../style/theme';
 
-import { Container, Flex, Text } from '../ui';
-
 export interface InputProps {
     className?: string;
     value?: string;
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx
index 6075a5b21..716227b51 100644
--- a/packages/instant/src/components/zero_ex_instant_container.tsx
+++ b/packages/instant/src/components/zero_ex_instant_container.tsx
@@ -5,7 +5,7 @@ import { ColorOption } from '../style/theme';
 import { BuyButton } from './buy_button';
 import { InstantHeading } from './instant_heading';
 import { OrderDetails } from './order_details';
-import { Container, Flex, Text } from './ui';
+import { Container, Flex } from './ui';
 
 export interface ZeroExInstantContainerProps {}
 
-- 
cgit 


From 941448d65cc42870a93e0430158bfd7ab52fd2cd Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Tue, 9 Oct 2018 12:11:12 -0700
Subject: Fix empty input bug

---
 packages/instant/src/components/amount_input.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/amount_input.tsx b/packages/instant/src/components/amount_input.tsx
index 2b64469f6..29d1bf161 100644
--- a/packages/instant/src/components/amount_input.tsx
+++ b/packages/instant/src/components/amount_input.tsx
@@ -10,7 +10,7 @@ export interface AmountInputProps {
     fontColor?: ColorOption;
     fontSize?: string;
     value?: BigNumber;
-    onChange?: (value: BigNumber) => void;
+    onChange?: (value?: BigNumber) => void;
 }
 
 export class AmountInput extends React.Component<AmountInputProps> {
@@ -22,7 +22,7 @@ export class AmountInput extends React.Component<AmountInputProps> {
                     fontColor={fontColor}
                     fontSize={fontSize}
                     onChange={this._handleChange}
-                    value={value ? value.toString() : undefined}
+                    value={value ? value.toString() : ''}
                     placeholder="0.00"
                     width="2em"
                 />
@@ -30,9 +30,13 @@ export class AmountInput extends React.Component<AmountInputProps> {
         );
     }
     private readonly _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
-        const bigNumberValue = new BigNumber(event.target.value);
+        const value = event.target.value;
+        let bigNumberValue;
+        if (!_.isEmpty(value)) {
+            bigNumberValue = new BigNumber(event.target.value);
+        }
         if (!_.isUndefined(this.props.onChange)) {
             this.props.onChange(bigNumberValue);
         }
-    }
+    };
 }
-- 
cgit 


From 7bc9cd8c943972b2800e70fc6eaaf9c01ff5c488 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 10 Oct 2018 16:43:55 -0700
Subject: Fix issue where we throw if non-numeric characters are used in input

---
 packages/instant/src/components/amount_input.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/amount_input.tsx b/packages/instant/src/components/amount_input.tsx
index 29d1bf161..12cb9a48c 100644
--- a/packages/instant/src/components/amount_input.tsx
+++ b/packages/instant/src/components/amount_input.tsx
@@ -29,11 +29,16 @@ export class AmountInput extends React.Component<AmountInputProps> {
             </Container>
         );
     }
-    private readonly _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
+    private _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
         const value = event.target.value;
         let bigNumberValue;
         if (!_.isEmpty(value)) {
-            bigNumberValue = new BigNumber(event.target.value);
+            try {
+                bigNumberValue = new BigNumber(event.target.value);
+            } catch {
+                // We don't want to allow values that can't be a BigNumber, so don't even call onChange.
+                return;
+            }
         }
         if (!_.isUndefined(this.props.onChange)) {
             this.props.onChange(bigNumberValue);
-- 
cgit 


From c8e7d225ca4bc9774b4f902c01668873cbdce6a1 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 10 Oct 2018 16:55:59 -0700
Subject: Be more explicit with falsiness

---
 packages/instant/src/components/amount_input.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/amount_input.tsx b/packages/instant/src/components/amount_input.tsx
index 12cb9a48c..3f16869b4 100644
--- a/packages/instant/src/components/amount_input.tsx
+++ b/packages/instant/src/components/amount_input.tsx
@@ -22,7 +22,7 @@ export class AmountInput extends React.Component<AmountInputProps> {
                     fontColor={fontColor}
                     fontSize={fontSize}
                     onChange={this._handleChange}
-                    value={value ? value.toString() : ''}
+                    value={!_.isUndefined(value) ? value.toString() : ''}
                     placeholder="0.00"
                     width="2em"
                 />
-- 
cgit 


From 9fe88b214653f39f63266198f426a68dafbe7890 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 10 Oct 2018 17:14:17 -0700
Subject: Lint and update deps

---
 packages/instant/src/components/amount_input.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/instant/src/components')

diff --git a/packages/instant/src/components/amount_input.tsx b/packages/instant/src/components/amount_input.tsx
index 3f16869b4..38810063d 100644
--- a/packages/instant/src/components/amount_input.tsx
+++ b/packages/instant/src/components/amount_input.tsx
@@ -29,7 +29,7 @@ export class AmountInput extends React.Component<AmountInputProps> {
             </Container>
         );
     }
-    private _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
+    private readonly _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
         const value = event.target.value;
         let bigNumberValue;
         if (!_.isEmpty(value)) {
-- 
cgit