diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:35:38 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:36:19 +0100 |
commit | 93137229bf3b04e4589ae315a81ed2de7a171ded (patch) | |
tree | 703432658a50425e2a295f527c9fdb392211bfd3 /packages/ui | |
parent | add workspaces count badge in settings navigation (diff) | |
download | ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip |
fix merge conflicts with latest develop
Diffstat (limited to 'packages/ui')
-rw-r--r-- | packages/ui/package.json | 6 | ||||
-rw-r--r-- | packages/ui/src/infobox/index.tsx | 7 |
2 files changed, 9 insertions, 4 deletions
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 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/ui", | 2 | "name": "@meetfranz/ui", |
3 | "version": "0.0.4", | 3 | "version": "0.0.6", |
4 | "description": "React UI components for Franz", | 4 | "description": "React UI components for Franz", |
5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
6 | "scripts": { | 6 | "scripts": { |
@@ -25,7 +25,7 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "@mdi/js": "^3.3.92", | 26 | "@mdi/js": "^3.3.92", |
27 | "@mdi/react": "^1.1.0", | 27 | "@mdi/react": "^1.1.0", |
28 | "@meetfranz/theme": "^1.0.7", | 28 | "@meetfranz/theme": "^1.0.11", |
29 | "react-loader": "^2.4.5" | 29 | "react-loader": "^2.4.5" |
30 | }, | 30 | }, |
31 | "peerDependencies": { | 31 | "peerDependencies": { |
@@ -34,5 +34,5 @@ | |||
34 | "react-dom": "16.7.0", | 34 | "react-dom": "16.7.0", |
35 | "react-jss": "^8.6.1" | 35 | "react-jss": "^8.6.1" |
36 | }, | 36 | }, |
37 | "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b" | 37 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" |
38 | } | 38 | } |
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 | ||
20 | interface IState { | 21 | interface 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, |