diff options
author | 2019-09-04 13:14:00 +0200 | |
---|---|---|
committer | 2019-09-04 13:14:00 +0200 | |
commit | 8a4af9d7252e53095c1f1874301660ac77eedd5d (patch) | |
tree | ec2ff58a4d1f67fb96fbc5eb7fb6cb66043a8412 | |
parent | Update en-US.json (diff) | |
download | ferdium-app-8a4af9d7252e53095c1f1874301660ac77eedd5d.tar.gz ferdium-app-8a4af9d7252e53095c1f1874301660ac77eedd5d.tar.zst ferdium-app-8a4af9d7252e53095c1f1874301660ac77eedd5d.zip |
Fix icons & button color
-rw-r--r-- | src/features/shareFranz/Component.js | 12 | ||||
-rw-r--r-- | src/i18n/messages/src/features/shareFranz/Component.json | 28 |
2 files changed, 21 insertions, 19 deletions
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js index 859c0ebe9..09110179a 100644 --- a/src/features/shareFranz/Component.js +++ b/src/features/shareFranz/Component.js | |||
@@ -6,7 +6,9 @@ import { defineMessages, intlShape } from 'react-intl'; | |||
6 | import { Button } from '@meetfranz/forms'; | 6 | import { Button } from '@meetfranz/forms'; |
7 | import { H1, Icon } from '@meetfranz/ui'; | 7 | import { H1, Icon } from '@meetfranz/ui'; |
8 | 8 | ||
9 | import { mdiHeart } from '@mdi/js'; | 9 | import { |
10 | mdiHeart, mdiEmail, mdiFacebookBox, mdiTwitter | ||
11 | } from '@mdi/js'; | ||
10 | import Modal from '../../components/ui/Modal'; | 12 | import Modal from '../../components/ui/Modal'; |
11 | import { state } from '.'; | 13 | import { state } from '.'; |
12 | import { gaEvent } from '../../lib/analytics'; | 14 | import { gaEvent } from '../../lib/analytics'; |
@@ -76,7 +78,7 @@ const styles = theme => ({ | |||
76 | }, | 78 | }, |
77 | cta: { | 79 | cta: { |
78 | background: theme.styleTypes.primary.contrast, | 80 | background: theme.styleTypes.primary.contrast, |
79 | color: theme.styleTypes.primary.accent, | 81 | color: `${theme.styleTypes.primary.accent} !important`, |
80 | 82 | ||
81 | '& svg': { | 83 | '& svg': { |
82 | fill: theme.styleTypes.primary.accent, | 84 | fill: theme.styleTypes.primary.accent, |
@@ -127,7 +129,7 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz | |||
127 | <Button | 129 | <Button |
128 | label={intl.formatMessage(messages.actionsEmail)} | 130 | label={intl.formatMessage(messages.actionsEmail)} |
129 | className={classes.cta} | 131 | className={classes.cta} |
130 | icon="mdiEmail" | 132 | icon={mdiEmail} |
131 | href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareTextEmail, { count: serviceCount })}}`} | 133 | href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareTextEmail, { count: serviceCount })}}`} |
132 | target="_blank" | 134 | target="_blank" |
133 | onClick={() => { | 135 | onClick={() => { |
@@ -137,7 +139,7 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz | |||
137 | <Button | 139 | <Button |
138 | label={intl.formatMessage(messages.actionsFacebook)} | 140 | label={intl.formatMessage(messages.actionsFacebook)} |
139 | className={classes.cta} | 141 | className={classes.cta} |
140 | icon="mdiFacebookBox" | 142 | icon={mdiFacebookBox} |
141 | href="https://www.facebook.com/sharer/sharer.php?u=https://www.meetfranz.com?utm_source=facebook&utm_medium=referral&utm_campaign=share-button" | 143 | href="https://www.facebook.com/sharer/sharer.php?u=https://www.meetfranz.com?utm_source=facebook&utm_medium=referral&utm_campaign=share-button" |
142 | target="_blank" | 144 | target="_blank" |
143 | onClick={() => { | 145 | onClick={() => { |
@@ -147,7 +149,7 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz | |||
147 | <Button | 149 | <Button |
148 | label={intl.formatMessage(messages.actionsTwitter)} | 150 | label={intl.formatMessage(messages.actionsTwitter)} |
149 | className={classes.cta} | 151 | className={classes.cta} |
150 | icon="mdiTwitter" | 152 | icon={mdiTwitter} |
151 | href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareTextTwitter, { count: serviceCount })}`} | 153 | href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareTextTwitter, { count: serviceCount })}`} |
152 | target="_blank" | 154 | target="_blank" |
153 | onClick={() => { | 155 | onClick={() => { |
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json index 79b425b15..72150f2b0 100644 --- a/src/i18n/messages/src/features/shareFranz/Component.json +++ b/src/i18n/messages/src/features/shareFranz/Component.json | |||
@@ -4,11 +4,11 @@ | |||
4 | "defaultMessage": "!!!Franz is better together!", | 4 | "defaultMessage": "!!!Franz is better together!", |
5 | "file": "src/features/shareFranz/Component.js", | 5 | "file": "src/features/shareFranz/Component.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 16, | 7 | "line": 18, |
8 | "column": 12 | 8 | "column": 12 |
9 | }, | 9 | }, |
10 | "end": { | 10 | "end": { |
11 | "line": 19, | 11 | "line": 21, |
12 | "column": 3 | 12 | "column": 3 |
13 | } | 13 | } |
14 | }, | 14 | }, |
@@ -17,11 +17,11 @@ | |||
17 | "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.", | 17 | "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.", |
18 | "file": "src/features/shareFranz/Component.js", | 18 | "file": "src/features/shareFranz/Component.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 20, | 20 | "line": 22, |
21 | "column": 8 | 21 | "column": 8 |
22 | }, | 22 | }, |
23 | "end": { | 23 | "end": { |
24 | "line": 23, | 24 | "line": 25, |
25 | "column": 3 | 25 | "column": 3 |
26 | } | 26 | } |
27 | }, | 27 | }, |
@@ -30,11 +30,11 @@ | |||
30 | "defaultMessage": "!!!Share as email", | 30 | "defaultMessage": "!!!Share as email", |
31 | "file": "src/features/shareFranz/Component.js", | 31 | "file": "src/features/shareFranz/Component.js", |
32 | "start": { | 32 | "start": { |
33 | "line": 24, | 33 | "line": 26, |
34 | "column": 16 | 34 | "column": 16 |
35 | }, | 35 | }, |
36 | "end": { | 36 | "end": { |
37 | "line": 27, | 37 | "line": 29, |
38 | "column": 3 | 38 | "column": 3 |
39 | } | 39 | } |
40 | }, | 40 | }, |
@@ -43,11 +43,11 @@ | |||
43 | "defaultMessage": "!!!Share on Facebook", | 43 | "defaultMessage": "!!!Share on Facebook", |
44 | "file": "src/features/shareFranz/Component.js", | 44 | "file": "src/features/shareFranz/Component.js", |
45 | "start": { | 45 | "start": { |
46 | "line": 28, | 46 | "line": 30, |
47 | "column": 19 | 47 | "column": 19 |
48 | }, | 48 | }, |
49 | "end": { | 49 | "end": { |
50 | "line": 31, | 50 | "line": 33, |
51 | "column": 3 | 51 | "column": 3 |
52 | } | 52 | } |
53 | }, | 53 | }, |
@@ -56,11 +56,11 @@ | |||
56 | "defaultMessage": "!!!Share on Twitter", | 56 | "defaultMessage": "!!!Share on Twitter", |
57 | "file": "src/features/shareFranz/Component.js", | 57 | "file": "src/features/shareFranz/Component.js", |
58 | "start": { | 58 | "start": { |
59 | "line": 32, | 59 | "line": 34, |
60 | "column": 18 | 60 | "column": 18 |
61 | }, | 61 | }, |
62 | "end": { | 62 | "end": { |
63 | "line": 35, | 63 | "line": 37, |
64 | "column": 3 | 64 | "column": 3 |
65 | } | 65 | } |
66 | }, | 66 | }, |
@@ -69,11 +69,11 @@ | |||
69 | "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com", | 69 | "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com", |
70 | "file": "src/features/shareFranz/Component.js", | 70 | "file": "src/features/shareFranz/Component.js", |
71 | "start": { | 71 | "start": { |
72 | "line": 36, | 72 | "line": 38, |
73 | "column": 18 | 73 | "column": 18 |
74 | }, | 74 | }, |
75 | "end": { | 75 | "end": { |
76 | "line": 39, | 76 | "line": 41, |
77 | "column": 3 | 77 | "column": 3 |
78 | } | 78 | } |
79 | }, | 79 | }, |
@@ -82,11 +82,11 @@ | |||
82 | "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger", | 82 | "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger", |
83 | "file": "src/features/shareFranz/Component.js", | 83 | "file": "src/features/shareFranz/Component.js", |
84 | "start": { | 84 | "start": { |
85 | "line": 40, | 85 | "line": 42, |
86 | "column": 20 | 86 | "column": 20 |
87 | }, | 87 | }, |
88 | "end": { | 88 | "end": { |
89 | "line": 43, | 89 | "line": 45, |
90 | "column": 3 | 90 | "column": 3 |
91 | } | 91 | } |
92 | } | 92 | } |