7 files changed, 53 insertions, 16 deletions

diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx
index 6959cde73..9faedc8f1 100644
--- a/packages/forms/src/button/index.tsx
+++ b/packages/forms/src/button/index.tsx
@@ -44,7 +44,7 @@ const styles = (theme: Theme) => ({
     width: (props: IProps) => (props.stretch ? '100%' : 'auto') as CSS.WidthProperty<string>,
     fontSize: theme.uiFontSize,
     textDecoration: 'none',
-    height: theme.buttonHeight,
+    // height: theme.buttonHeight,
 
     '&:hover': {
       opacity: 0.8,
@@ -129,8 +129,7 @@ const styles = (theme: Theme) => ({
     position: (props: IProps): CSS.PositionProperty => props.stretch ? 'absolute' : 'inherit',
   },
   icon: {
-    marginLeft: -5,
-    marginRight: 10,
+    margin: [1, 10, 0, -5],
   },
 });
 
@@ -142,7 +141,6 @@ class ButtonComponent extends Component<IProps> {
     buttonType: 'primary' as ButtonType,
     stretch: false,
     busy: false,
-    // target: '_self'
   };
 
   state = {
@@ -220,7 +218,7 @@ class ButtonComponent extends Component<IProps> {
           {icon && (
             <Icon
               path={icon}
-              size={1}
+              size={0.8}
               className={classes.icon}
             />
           )}
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx
index a2d7c62d5..b96dbc12d 100644
--- a/packages/forms/src/input/index.tsx
+++ b/packages/forms/src/input/index.tsx
@@ -83,7 +83,7 @@ class InputComponent extends Component<IProps, IState> {
   }
 
   onInputKeyPress(e: React.KeyboardEvent) {
-    if (e.key === "Enter") {
+    if (e.key === 'Enter') {
       const { onEnterKey } = this.props;
       onEnterKey && onEnterKey();
     }
@@ -114,6 +114,7 @@ class InputComponent extends Component<IProps, IState> {
       max,
       step,
       required,
+      noMargin,
     } = this.props;
 
     const {
@@ -127,6 +128,7 @@ class InputComponent extends Component<IProps, IState> {
       <Wrapper
         className={className}
         identifier="franz-input"
+        noMargin={noMargin}
       >
         <Label
           title={label}
diff --git a/packages/forms/src/typings/generic.ts b/packages/forms/src/typings/generic.ts
index 9688ce2c7..29136dfed 100644
--- a/packages/forms/src/typings/generic.ts
+++ b/packages/forms/src/typings/generic.ts
@@ -6,6 +6,7 @@ export interface IFormField {
   label?: string;
   error?: string;
   required?: boolean;
+  noMargin?: boolean;
 }
 
 export interface IWithStyle {
diff --git a/packages/forms/src/wrapper/index.tsx b/packages/forms/src/wrapper/index.tsx
index d9c61381d..cf179bc5e 100644
--- a/packages/forms/src/wrapper/index.tsx
+++ b/packages/forms/src/wrapper/index.tsx
@@ -3,14 +3,19 @@ import React, { Component } from 'react';
 import injectStyle from 'react-jss';
 import { IWithStyle } from '../typings/generic';
 
-import styles from './styles';
-
 interface IProps extends IWithStyle {
   children: React.ReactNode;
   className?: string;
   identifier: string;
+  noMargin?: boolean;
 }
 
+const styles = {
+  container: {
+    marginBottom: (props: IProps) => props.noMargin ? 0 : 20,
+  },
+};
+
 class WrapperComponent extends Component<IProps> {
   render() {
     const {
diff --git a/packages/forms/src/wrapper/styles.ts b/packages/forms/src/wrapper/styles.ts
deleted file mode 100644
index 72306b252..000000000
--- a/packages/forms/src/wrapper/styles.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  container: {
-    marginBottom: 20,
-  },
-};
diff --git a/uidev/src/app.tsx b/uidev/src/app.tsx
index 870911c2f..cef22e7a7 100644
--- a/uidev/src/app.tsx
+++ b/uidev/src/app.tsx
@@ -2,7 +2,7 @@ import CSS from 'csstype';
 import { Classes } from 'jss';
 import { observer } from 'mobx-react';
 import DevTools from 'mobx-react-devtools';
-import React, { Component } from 'react';
+import React from 'react';
 import injectSheet from 'react-jss';
 
 import { WithTheme } from './withTheme';
diff --git a/uidev/src/stories/button.stories.tsx b/uidev/src/stories/button.stories.tsx
index c8e9bcbf3..f7537895c 100644
--- a/uidev/src/stories/button.stories.tsx
+++ b/uidev/src/stories/button.stories.tsx
@@ -1,8 +1,11 @@
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import React from 'react';
+import injectSheet from 'react-jss';
 
-import { Button } from '@meetfranz/forms';
+import { Button, Input } from '@meetfranz/forms';
+import { classes } from 'istanbul-lib-coverage';
+import { Classes } from 'jss';
 import { storiesOf } from '../stores/stories';
 
 const defaultProps = {
@@ -13,6 +16,17 @@ const defaultProps = {
   disabled: false,
 };
 
+const styles = {
+  combinedElements: {
+    display: 'flex',
+    justifyContent: 'space-between',
+  },
+  input: {
+    flex: 1,
+    marginRight: 20,
+  },
+};
+
 const createStore = (args?: any) => {
   return observable(Object.assign({}, defaultProps, args));
 };
@@ -99,4 +113,26 @@ storiesOf('Button')
         e.preventDefault();
         alert('Click event');
       },
-    })} />));
+    })}/>
+  ))
+  .add('Long multi-line button', () => (
+    <WithStoreButton store={createStore({
+      label: 'But there is something that I must say to my people, who stand on the warm threshold which leads into the palace of justice: In the process of gaining our rightful place, we must not be guilty of wrongful deeds. Let us not seek to satisfy our thirst for freedom by drinking from the cup of bitterness and hatred. We must forever conduct our struggle on the high plane of dignity and discipline. We must not allow our creative protest to degenerate into physical violence. Again and again, we must rise to the majestic heights of meeting physical force with soul force.',
+    })} />
+  ))
+  .add('Button with Input', injectSheet(styles)(observer(({ classes }: { classes: Classes }) => (
+      <div className={classes.combinedElements}>
+        <Input showLabel={false} className={classes.input} noMargin />
+        <WithStoreButton store={createStore({})} />
+      </div>
+    )),
+  ))
+  .add('Icon Button with Input', injectSheet(styles)(observer(({ classes }: { classes: Classes }) => (
+      <div className={classes.combinedElements}>
+        <Input showLabel={false} className={classes.input} noMargin />
+        <WithStoreButton store={createStore({
+          icon: 'mdiInformation',
+        })} />
+      </div>
+    )),
+  ));