diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-02-06 20:28:15 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-02-06 20:28:15 +0100 |
commit | 14b151cad6a5a849bb476aaa3fc53bf1eead7f4b (patch) | |
tree | 8daa38d28fe21e1745093962526dd36744be4274 /packages/ui/src | |
parent | update versions (diff) | |
download | ferdium-app-14b151cad6a5a849bb476aaa3fc53bf1eead7f4b.tar.gz ferdium-app-14b151cad6a5a849bb476aaa3fc53bf1eead7f4b.tar.zst ferdium-app-14b151cad6a5a849bb476aaa3fc53bf1eead7f4b.zip |
cleanup
Diffstat (limited to 'packages/ui/src')
-rw-r--r-- | packages/ui/src/badge/index.tsx | 1 | ||||
-rw-r--r-- | packages/ui/src/headline/index.tsx | 2 | ||||
-rw-r--r-- | packages/ui/src/infobox/index.tsx | 4 | ||||
-rw-r--r-- | packages/ui/src/loader/index.tsx | 11 |
4 files changed, 10 insertions, 8 deletions
diff --git a/packages/ui/src/badge/index.tsx b/packages/ui/src/badge/index.tsx index 241e778e7..fc52ecc73 100644 --- a/packages/ui/src/badge/index.tsx +++ b/packages/ui/src/badge/index.tsx | |||
@@ -65,6 +65,7 @@ class BadgeComponent extends Component<IProps> { | |||
65 | [classes[type]]: true, | 65 | [classes[type]]: true, |
66 | [`${className}`]: className, | 66 | [`${className}`]: className, |
67 | })} | 67 | })} |
68 | data-type="franz-badge" | ||
68 | > | 69 | > |
69 | {children} | 70 | {children} |
70 | </div> | 71 | </div> |
diff --git a/packages/ui/src/headline/index.tsx b/packages/ui/src/headline/index.tsx index 3458a40ad..7eabfcf80 100644 --- a/packages/ui/src/headline/index.tsx +++ b/packages/ui/src/headline/index.tsx | |||
@@ -3,7 +3,6 @@ import classnames from 'classnames'; | |||
3 | import React, { Component } from 'react'; | 3 | import React, { Component } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle from 'react-jss'; |
5 | 5 | ||
6 | import { uiFontSize } from '@meetfranz/theme/lib/themes/default'; | ||
7 | import { IWithStyle, Omit } from '../typings/generic'; | 6 | import { IWithStyle, Omit } from '../typings/generic'; |
8 | 7 | ||
9 | interface IProps extends IWithStyle { | 8 | interface IProps extends IWithStyle { |
@@ -55,6 +54,7 @@ class HeadlineComponent extends Component<IProps> { | |||
55 | [classes[level ? `h${level}` : 'h1']]: true, | 54 | [classes[level ? `h${level}` : 'h1']]: true, |
56 | [`${className}`]: className, | 55 | [`${className}`]: className, |
57 | }), | 56 | }), |
57 | 'data-type': 'franz-headline', | ||
58 | }, | 58 | }, |
59 | children, | 59 | children, |
60 | ); | 60 | ); |
diff --git a/packages/ui/src/infobox/index.tsx b/packages/ui/src/infobox/index.tsx index bf985ea9c..53ed16341 100644 --- a/packages/ui/src/infobox/index.tsx +++ b/packages/ui/src/infobox/index.tsx | |||
@@ -1,9 +1,7 @@ | |||
1 | import { Theme } from '@meetfranz/theme'; | 1 | import { Theme } from '@meetfranz/theme'; |
2 | import classnames from 'classnames'; | 2 | import classnames from 'classnames'; |
3 | import { observer } from 'mobx-react'; | ||
4 | import React, { Component } from 'react'; | 3 | import React, { Component } from 'react'; |
5 | import injectStyle from 'react-jss'; | 4 | import injectStyle from 'react-jss'; |
6 | // import Loader from 'react-loader'; | ||
7 | 5 | ||
8 | import { Icon } from '../'; | 6 | import { Icon } from '../'; |
9 | import { IWithStyle } from '../typings/generic'; | 7 | import { IWithStyle } from '../typings/generic'; |
@@ -95,7 +93,6 @@ const styles = (theme: Theme) => ({ | |||
95 | ...buttonStyles(theme), | 93 | ...buttonStyles(theme), |
96 | }); | 94 | }); |
97 | 95 | ||
98 | @observer | ||
99 | class InfoboxComponent extends Component<IProps, IState> { | 96 | class InfoboxComponent extends Component<IProps, IState> { |
100 | public static defaultProps = { | 97 | public static defaultProps = { |
101 | type: 'primary', | 98 | type: 'primary', |
@@ -160,6 +157,7 @@ class InfoboxComponent extends Component<IProps, IState> { | |||
160 | [classes[`${type}`]]: type, | 157 | [classes[`${type}`]]: type, |
161 | [classes.dismissing]: isDismissing, | 158 | [classes.dismissing]: isDismissing, |
162 | })} | 159 | })} |
160 | data-type="franz-infobox" | ||
163 | > | 161 | > |
164 | {icon && ( | 162 | {icon && ( |
165 | <Icon icon={icon} className={classes.icon} /> | 163 | <Icon icon={icon} className={classes.icon} /> |
diff --git a/packages/ui/src/loader/index.tsx b/packages/ui/src/loader/index.tsx index 799caf195..de5ba5237 100644 --- a/packages/ui/src/loader/index.tsx +++ b/packages/ui/src/loader/index.tsx | |||
@@ -26,10 +26,13 @@ class LoaderComponent extends Component<IProps> { | |||
26 | } = this.props; | 26 | } = this.props; |
27 | 27 | ||
28 | return ( | 28 | return ( |
29 | <div className={classnames({ | 29 | <div |
30 | [classes.container]: true, | 30 | className={classnames({ |
31 | [`${className}`]: className, | 31 | [classes.container]: true, |
32 | })}> | 32 | [`${className}`]: className, |
33 | })} | ||
34 | data-type="franz-loader" | ||
35 | > | ||
33 | <ReactLoader | 36 | <ReactLoader |
34 | loaded={false} | 37 | loaded={false} |
35 | width={4} | 38 | width={4} |