aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package-lock.json16
-rw-r--r--package.json1
-rw-r--r--src/components/ui/FeatureItem.js3
-rw-r--r--src/components/ui/Modal/index.js3
-rw-r--r--src/features/shareFranz/Component.js3
5 files changed, 19 insertions, 7 deletions
diff --git a/package-lock.json b/package-lock.json
index 13646552b..048425eb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "franz", 2 "name": "franz",
3 "version": "5.2.0-beta.4", 3 "version": "5.2.1-beta.1",
4 "lockfileVersion": 1, 4 "lockfileVersion": 1,
5 "requires": true, 5 "requires": true,
6 "dependencies": { 6 "dependencies": {
@@ -2149,9 +2149,9 @@
2149 } 2149 }
2150 }, 2150 },
2151 "@mdi/js": { 2151 "@mdi/js": {
2152 "version": "3.4.93", 2152 "version": "4.2.95",
2153 "resolved": "https://registry.npmjs.org/@mdi/js/-/js-3.4.93.tgz", 2153 "resolved": "https://registry.npmjs.org/@mdi/js/-/js-4.2.95.tgz",
2154 "integrity": "sha512-SEzolEqT8ErlWdHz4AAtQ1lTfAnM6j67Ppm6k5s/I1aIuuoFP/D8d/z838C28xHO1KOqrsS1fw2wlf6fRiEEJA==" 2154 "integrity": "sha512-3qqOZx2HkrQEUc9fr5MiQWlokwmO8TK5bQZ2EP1Rg0q2Q507jy+fUeL8lb9ko2ossYqoPnugIr7jI0/O7uhlrA=="
2155 }, 2155 },
2156 "@mdi/react": { 2156 "@mdi/react": {
2157 "version": "1.1.0", 2157 "version": "1.1.0",
@@ -2178,6 +2178,10 @@
2178 "react-loader": "^2.4.5" 2178 "react-loader": "^2.4.5"
2179 }, 2179 },
2180 "dependencies": { 2180 "dependencies": {
2181 "@mdi/js": {
2182 "version": "3.9.97",
2183 "bundled": true
2184 },
2181 "@meetfranz/theme": { 2185 "@meetfranz/theme": {
2182 "version": "1.0.14", 2186 "version": "1.0.14",
2183 "bundled": true, 2187 "bundled": true,
@@ -2202,6 +2206,10 @@
2202 "react-loader": "^2.4.5" 2206 "react-loader": "^2.4.5"
2203 }, 2207 },
2204 "dependencies": { 2208 "dependencies": {
2209 "@mdi/js": {
2210 "version": "3.9.97",
2211 "bundled": true
2212 },
2205 "@meetfranz/theme": { 2213 "@meetfranz/theme": {
2206 "version": "1.0.14", 2214 "version": "1.0.14",
2207 "bundled": true, 2215 "bundled": true,
diff --git a/package.json b/package.json
index f7ae953f4..d30fa08c5 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
36 "dependencies": { 36 "dependencies": {
37 "@babel/polyfill": "7.4.4", 37 "@babel/polyfill": "7.4.4",
38 "@babel/runtime": "7.4.5", 38 "@babel/runtime": "7.4.5",
39 "@mdi/js": "4.2.95",
39 "@meetfranz/electron-notification-state": "1.0.0", 40 "@meetfranz/electron-notification-state": "1.0.0",
40 "@meetfranz/forms": "file:packages/forms", 41 "@meetfranz/forms": "file:packages/forms",
41 "@meetfranz/theme": "file:packages/theme", 42 "@meetfranz/theme": "file:packages/theme",
diff --git a/src/components/ui/FeatureItem.js b/src/components/ui/FeatureItem.js
index a63f5f7b5..53616f2eb 100644
--- a/src/components/ui/FeatureItem.js
+++ b/src/components/ui/FeatureItem.js
@@ -2,6 +2,7 @@ import React from 'react';
2import injectSheet from 'react-jss'; 2import injectSheet from 'react-jss';
3import { Icon } from '@meetfranz/ui'; 3import { Icon } from '@meetfranz/ui';
4import classnames from 'classnames'; 4import classnames from 'classnames';
5import { mdiCheckCircle } from '@mdi/js';
5 6
6const styles = theme => ({ 7const styles = theme => ({
7 featureItem: { 8 featureItem: {
@@ -27,7 +28,7 @@ export const FeatureItem = injectSheet(styles)(({
27 {icon ? ( 28 {icon ? (
28 <span className={classes.featureIcon}>{icon}</span> 29 <span className={classes.featureIcon}>{icon}</span>
29 ) : ( 30 ) : (
30 <Icon icon="mdiCheckCircle" className={classes.featureIcon} size={1.5} /> 31 <Icon icon={mdiCheckCircle} className={classes.featureIcon} size={1.5} />
31 )} 32 )}
32 {name} 33 {name}
33 </li> 34 </li>
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index 0b7154760..63d858c47 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -5,6 +5,7 @@ import classnames from 'classnames';
5import injectCSS from 'react-jss'; 5import injectCSS from 'react-jss';
6import { Icon } from '@meetfranz/ui'; 6import { Icon } from '@meetfranz/ui';
7 7
8import { mdiClose } from '@mdi/js';
8import styles from './styles'; 9import styles from './styles';
9 10
10// ReactModal.setAppElement('#root'); 11// ReactModal.setAppElement('#root');
@@ -59,7 +60,7 @@ export default @injectCSS(styles) class Modal extends Component {
59 className={classes.close} 60 className={classes.close}
60 onClick={close} 61 onClick={close}
61 > 62 >
62 <Icon icon="mdiClose" size={1.5} /> 63 <Icon icon={mdiClose} size={1.5} />
63 </button> 64 </button>
64 )} 65 )}
65 <div className={classes.content}> 66 <div className={classes.content}>
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
index 8d1d595c5..859c0ebe9 100644
--- a/src/features/shareFranz/Component.js
+++ b/src/features/shareFranz/Component.js
@@ -6,6 +6,7 @@ import { defineMessages, intlShape } from 'react-intl';
6import { Button } from '@meetfranz/forms'; 6import { Button } from '@meetfranz/forms';
7import { H1, Icon } from '@meetfranz/ui'; 7import { H1, Icon } from '@meetfranz/ui';
8 8
9import { mdiHeart } from '@mdi/js';
9import Modal from '../../components/ui/Modal'; 10import Modal from '../../components/ui/Modal';
10import { state } from '.'; 11import { state } from '.';
11import { gaEvent } from '../../lib/analytics'; 12import { gaEvent } from '../../lib/analytics';
@@ -116,7 +117,7 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
116 close={this.close.bind(this)} 117 close={this.close.bind(this)}
117 > 118 >
118 <div className={classes.heartContainer}> 119 <div className={classes.heartContainer}>
119 <Icon icon="mdiHeart" className={classes.heart} size={4} /> 120 <Icon icon={mdiHeart} className={classes.heart} size={4} />
120 </div> 121 </div>
121 <H1 className={classes.headline}> 122 <H1 className={classes.headline}>
122 {intl.formatMessage(messages.headline)} 123 {intl.formatMessage(messages.headline)}