From 93137229bf3b04e4589ae315a81ed2de7a171ded Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Thu, 21 Mar 2019 16:35:38 +0100 Subject: fix merge conflicts with latest develop --- packages/ui/package.json | 6 +++--- packages/ui/src/infobox/index.tsx | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'packages/ui') diff --git a/packages/ui/package.json b/packages/ui/package.json index 62a1e5a6e..fb36555c4 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@meetfranz/ui", - "version": "0.0.4", + "version": "0.0.6", "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.7", + "@meetfranz/theme": "^1.0.11", "react-loader": "^2.4.5" }, "peerDependencies": { @@ -34,5 +34,5 @@ "react-dom": "16.7.0", "react-jss": "^8.6.1" }, - "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b" + "gitHead": "27778954921365e4957eae964e28f68690f3825f" } diff --git a/packages/ui/src/infobox/index.tsx b/packages/ui/src/infobox/index.tsx index 53ed16341..1a442a733 100644 --- a/packages/ui/src/infobox/index.tsx +++ b/packages/ui/src/infobox/index.tsx @@ -15,6 +15,7 @@ interface IProps extends IWithStyle { ctaLabel?: string; ctaLoading?: boolean; children: React.ReactNode; + className: string; } interface IState { @@ -138,6 +139,7 @@ class InfoboxComponent extends Component { ctaLoading, ctaOnClick, dismissable, + className, } = this.props; const { @@ -150,7 +152,10 @@ class InfoboxComponent extends Component { } return ( -
+