aboutsummaryrefslogtreecommitdiffstats
path: root/packages/ui
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-06-14 17:21:33 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-06-14 17:21:33 +0200
commitb0e2f5cb5ea7109a81b1f9404fed084a25996efb (patch)
tree1df0700fa627a10971db62421bf6383cf3ce4080 /packages/ui
parentRestrict services with customURL when not premium user (diff)
parentFix issue with dev recipe list (diff)
downloadferdium-app-b0e2f5cb5ea7109a81b1f9404fed084a25996efb.tar.gz
ferdium-app-b0e2f5cb5ea7109a81b1f9404fed084a25996efb.tar.zst
ferdium-app-b0e2f5cb5ea7109a81b1f9404fed084a25996efb.zip
Merge branch 'feature/3rd-party-limit' into feature/new-pricing
Diffstat (limited to 'packages/ui')
-rw-r--r--packages/ui/src/badge/ProBadge.tsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/ui/src/badge/ProBadge.tsx b/packages/ui/src/badge/ProBadge.tsx
index 612e23210..2dad7ef49 100644
--- a/packages/ui/src/badge/ProBadge.tsx
+++ b/packages/ui/src/badge/ProBadge.tsx
@@ -3,13 +3,14 @@ import classnames from 'classnames';
3import React, { Component } from 'react'; 3import React, { Component } from 'react';
4import injectStyle from 'react-jss'; 4import injectStyle from 'react-jss';
5 5
6import { Icon, Badge } from '../'; 6import { Badge, Icon } from '../';
7import { IWithStyle } from '../typings/generic'; 7import { IWithStyle } from '../typings/generic';
8 8
9interface IProps extends IWithStyle { 9interface IProps extends IWithStyle {
10 badgeClasses?: string; 10 badgeClasses?: string;
11 iconClasses?: string; 11 iconClasses?: string;
12 inverted?: boolean; 12 inverted?: boolean;
13 className?: string;
13} 14}
14 15
15const styles = (theme: Theme) => ({ 16const styles = (theme: Theme) => ({
@@ -37,6 +38,7 @@ class ProBadgeComponent extends Component<IProps> {
37 badgeClasses, 38 badgeClasses,
38 iconClasses, 39 iconClasses,
39 inverted, 40 inverted,
41 className,
40 } = this.props; 42 } = this.props;
41 43
42 return ( 44 return (
@@ -46,6 +48,7 @@ class ProBadgeComponent extends Component<IProps> {
46 classes.badge, 48 classes.badge,
47 inverted && classes.invertedBadge, 49 inverted && classes.invertedBadge,
48 badgeClasses, 50 badgeClasses,
51 className,
49 ])} 52 ])}
50 > 53 >
51 <Icon 54 <Icon