diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/theme/src/themes/dark/index.ts | 10 | ||||
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 12 | ||||
-rw-r--r-- | packages/ui/src/badge/ProBadge.tsx | 5 | ||||
-rw-r--r-- | packages/ui/src/infobox/index.tsx | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts index d29345298..93c18efde 100644 --- a/packages/theme/src/themes/dark/index.ts +++ b/packages/theme/src/themes/dark/index.ts | |||
@@ -119,6 +119,16 @@ export const announcements = merge({}, defaultStyles.announcements, { | |||
119 | }, | 119 | }, |
120 | }); | 120 | }); |
121 | 121 | ||
122 | // Signup | ||
123 | export const signup = merge({}, defaultStyles.signup, { | ||
124 | pricing: { | ||
125 | feature: { | ||
126 | background: legacyStyles.darkThemeGrayLight, | ||
127 | border: color(legacyStyles.darkThemeGrayLight).lighten(0.2).hex(), | ||
128 | }, | ||
129 | }, | ||
130 | }); | ||
131 | |||
122 | // Todos | 132 | // Todos |
123 | export const todos = merge({}, defaultStyles.todos, { | 133 | export const todos = merge({}, defaultStyles.todos, { |
124 | todosLayer: { | 134 | todosLayer: { |
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index 9f9c39f9a..7edf8331f 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -208,6 +208,16 @@ export const announcements = { | |||
208 | }, | 208 | }, |
209 | }; | 209 | }; |
210 | 210 | ||
211 | // Signup | ||
212 | export const signup = { | ||
213 | pricing: { | ||
214 | feature: { | ||
215 | background: legacyStyles.themeGrayLightest, | ||
216 | border: legacyStyles.themeGrayLighter, | ||
217 | }, | ||
218 | }, | ||
219 | }; | ||
220 | |||
211 | // Todos | 221 | // Todos |
212 | export const todos = { | 222 | export const todos = { |
213 | todosLayer: { | 223 | todosLayer: { |
@@ -223,5 +233,5 @@ export const todos = { | |||
223 | }, | 233 | }, |
224 | resizeHandler: { | 234 | resizeHandler: { |
225 | backgroundHover: styleTypes.primary.accent, | 235 | backgroundHover: styleTypes.primary.accent, |
226 | } | 236 | }, |
227 | }; | 237 | }; |
diff --git a/packages/ui/src/badge/ProBadge.tsx b/packages/ui/src/badge/ProBadge.tsx index c18cb4a0c..5cc41f5b2 100644 --- a/packages/ui/src/badge/ProBadge.tsx +++ b/packages/ui/src/badge/ProBadge.tsx | |||
@@ -4,13 +4,14 @@ import classnames from 'classnames'; | |||
4 | import React, { Component } from 'react'; | 4 | import React, { Component } from 'react'; |
5 | import injectStyle from 'react-jss'; | 5 | import injectStyle from 'react-jss'; |
6 | 6 | ||
7 | import { Icon, Badge } from '../'; | 7 | import { Badge, Icon } from '../'; |
8 | import { IWithStyle } from '../typings/generic'; | 8 | import { IWithStyle } from '../typings/generic'; |
9 | 9 | ||
10 | interface IProps extends IWithStyle { | 10 | interface IProps extends IWithStyle { |
11 | badgeClasses?: string; | 11 | badgeClasses?: string; |
12 | iconClasses?: string; | 12 | iconClasses?: string; |
13 | inverted?: boolean; | 13 | inverted?: boolean; |
14 | className?: string; | ||
14 | } | 15 | } |
15 | 16 | ||
16 | const styles = (theme: Theme) => ({ | 17 | const styles = (theme: Theme) => ({ |
@@ -38,6 +39,7 @@ class ProBadgeComponent extends Component<IProps> { | |||
38 | badgeClasses, | 39 | badgeClasses, |
39 | iconClasses, | 40 | iconClasses, |
40 | inverted, | 41 | inverted, |
42 | className, | ||
41 | } = this.props; | 43 | } = this.props; |
42 | 44 | ||
43 | return ( | 45 | return ( |
@@ -47,6 +49,7 @@ class ProBadgeComponent extends Component<IProps> { | |||
47 | classes.badge, | 49 | classes.badge, |
48 | inverted && classes.invertedBadge, | 50 | inverted && classes.invertedBadge, |
49 | badgeClasses, | 51 | badgeClasses, |
52 | className, | ||
50 | ])} | 53 | ])} |
51 | > | 54 | > |
52 | <Icon | 55 | <Icon |
diff --git a/packages/ui/src/infobox/index.tsx b/packages/ui/src/infobox/index.tsx index 5070ee7ef..e4c2c5a3e 100644 --- a/packages/ui/src/infobox/index.tsx +++ b/packages/ui/src/infobox/index.tsx | |||
@@ -49,13 +49,13 @@ const styles = (theme: Theme) => ({ | |||
49 | position: 'relative', | 49 | position: 'relative', |
50 | overflow: 'hidden', | 50 | overflow: 'hidden', |
51 | height: 'auto', | 51 | height: 'auto', |
52 | marginBottom: 30, | ||
52 | }, | 53 | }, |
53 | infobox: { | 54 | infobox: { |
54 | alignItems: 'center', | 55 | alignItems: 'center', |
55 | borderRadius: theme.borderRadiusSmall, | 56 | borderRadius: theme.borderRadiusSmall, |
56 | display: 'flex', | 57 | display: 'flex', |
57 | height: 'auto', | 58 | height: 'auto', |
58 | marginBottom: 30, | ||
59 | padding: '15px 20px', | 59 | padding: '15px 20px', |
60 | top: 0, | 60 | top: 0, |
61 | transition: 'all 0.5s', | 61 | transition: 'all 0.5s', |