aboutsummaryrefslogtreecommitdiffstats
path: root/packages/ui/src/infobox/index.tsx
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-21 16:35:38 +0100
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-21 16:36:19 +0100
commit93137229bf3b04e4589ae315a81ed2de7a171ded (patch)
tree703432658a50425e2a295f527c9fdb392211bfd3 /packages/ui/src/infobox/index.tsx
parentadd workspaces count badge in settings navigation (diff)
downloadferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz
ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst
ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip
fix merge conflicts with latest develop
Diffstat (limited to 'packages/ui/src/infobox/index.tsx')
-rw-r--r--packages/ui/src/infobox/index.tsx7
1 files changed, 6 insertions, 1 deletions
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 {
15 ctaLabel?: string; 15 ctaLabel?: string;
16 ctaLoading?: boolean; 16 ctaLoading?: boolean;
17 children: React.ReactNode; 17 children: React.ReactNode;
18 className: string;
18} 19}
19 20
20interface IState { 21interface IState {
@@ -138,6 +139,7 @@ class InfoboxComponent extends Component<IProps, IState> {
138 ctaLoading, 139 ctaLoading,
139 ctaOnClick, 140 ctaOnClick,
140 dismissable, 141 dismissable,
142 className,
141 } = this.props; 143 } = this.props;
142 144
143 const { 145 const {
@@ -150,7 +152,10 @@ class InfoboxComponent extends Component<IProps, IState> {
150 } 152 }
151 153
152 return ( 154 return (
153 <div className={classes.wrapper}> 155 <div className={classnames({
156 [classes.wrapper]: true,
157 [`${className}`]: className,
158 })}>
154 <div 159 <div
155 className={classnames({ 160 className={classnames({
156 [classes.infobox]: true, 161 [classes.infobox]: true,