From 9f2ab40b7602bc3df26ebb093b484b9917768f69 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Fri, 7 Jun 2019 11:25:54 +0200
Subject: Make buttons flexible in height

---
 packages/forms/src/button/index.tsx   | 8 +++-----
 packages/forms/src/input/index.tsx    | 4 +++-
 packages/forms/src/typings/generic.ts | 1 +
 packages/forms/src/wrapper/index.tsx  | 9 +++++++--
 packages/forms/src/wrapper/styles.ts  | 5 -----
 5 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 packages/forms/src/wrapper/styles.ts

(limited to 'packages')

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,
-  },
-};
-- 
cgit v1.2.3-70-g09d2