Merge branch 'develop' into feature/3rd-party-limit

9 files changed, 23 insertions, 22 deletions

diff --git a/packages/forms/package.json b/packages/forms/package.json
index 0ac9a846f..d50f4c756 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/forms",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "React form components for Franz",
   "main": "lib/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@mdi/js": "^3.3.92",
     "@mdi/react": "^1.1.0",
-    "@meetfranz/theme": "^1.0.13",
+    "@meetfranz/theme": "^1.0.14",
     "react-html-attributes": "^1.4.3",
     "react-loader": "^2.4.5"
   },
@@ -35,5 +35,5 @@
     "react-dom": "16.7.0",
     "react-jss": "^8.6.1"
   },
-  "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798"
+  "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
 }
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/packages/theme/package.json b/packages/theme/package.json
index 642904089..fa12c8a30 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/theme",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Theme configuration for Franz",
   "author": "Stefan Malzner <stefan@adlk.io>",
   "homepage": "https://github.com/meetfranz/franz",
@@ -25,5 +25,5 @@
   "dependencies": {
     "color": "^3.1.0"
   },
-  "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798"
+  "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
 }
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index d48dbf916..bd9f001e8 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -113,7 +113,7 @@ export const workspaces = merge({}, defaultStyles.workspaces, {
 });
 
 // Announcements
-export const announcements = merge({}, defaultStyles.workspaces, {
+export const announcements = merge({}, defaultStyles.announcements, {
   spotlight: {
     background: legacyStyles.darkThemeGrayDark,
   },
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 514b2cc7c..a851ed9cf 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/ui",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "React UI components for Franz",
   "main": "lib/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@mdi/js": "^3.3.92",
     "@mdi/react": "^1.1.0",
-    "@meetfranz/theme": "^1.0.13",
+    "@meetfranz/theme": "^1.0.14",
     "react-loader": "^2.4.5"
   },
   "peerDependencies": {
@@ -34,5 +34,5 @@
     "react-dom": "16.7.0",
     "react-jss": "^8.6.1"
   },
-  "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798"
+  "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
 }