diff options
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 2 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 2 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 2 | ||||
-rw-r--r-- | src/i18n/messages/src/features/shareFranz/Component.json | 2 | ||||
-rw-r--r-- | src/styles/settings.scss | 13 |
5 files changed, 16 insertions, 5 deletions
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index 945285f5a..1c51d50d6 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -80,7 +80,7 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp | |||
80 | {' '} | 80 | {' '} |
81 | {workspaceStore.isPremiumUpgradeRequired ? ( | 81 | {workspaceStore.isPremiumUpgradeRequired ? ( |
82 | <span className="badge badge--pro"> | 82 | <span className="badge badge--pro"> |
83 | <Icon icon="mdiStar" /> | 83 | <Icon icon="mdiStar" className="badge-icon-pro" /> |
84 | </span> | 84 | </span> |
85 | ) : ( | 85 | ) : ( |
86 | <span className="badge">{workspaceCount}</span> | 86 | <span className="badge">{workspaceCount}</span> |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 5e3988781..500053377 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -3204,7 +3204,7 @@ | |||
3204 | } | 3204 | } |
3205 | }, | 3205 | }, |
3206 | { | 3206 | { |
3207 | "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz", | 3207 | "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", |
3208 | "end": { | 3208 | "end": { |
3209 | "column": 3, | 3209 | "column": 3, |
3210 | "line": 42 | 3210 | "line": 42 |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index c36801d4a..9770ff0d5 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -313,4 +313,4 @@ | |||
313 | "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace", | 313 | "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace", |
314 | "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", | 314 | "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", |
315 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 315 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
316 | } | 316 | } \ No newline at end of file |
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json index 0fec9db64..34a43d5a0 100644 --- a/src/i18n/messages/src/features/shareFranz/Component.json +++ b/src/i18n/messages/src/features/shareFranz/Component.json | |||
@@ -79,7 +79,7 @@ | |||
79 | }, | 79 | }, |
80 | { | 80 | { |
81 | "id": "feature.shareFranz.shareText.twitter", | 81 | "id": "feature.shareFranz.shareText.twitter", |
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 @MeetFranz", | 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": 39, | 85 | "line": 39, |
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index d97d4ac2c..b4f013cad 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -433,10 +433,21 @@ | |||
433 | text-decoration: none; | 433 | text-decoration: none; |
434 | transition: background $theme-transition-time, color $theme-transition-time; | 434 | transition: background $theme-transition-time, color $theme-transition-time; |
435 | 435 | ||
436 | .badge--pro { | ||
437 | background: $theme-brand-primary !important; | ||
438 | padding: 4px 6px 3px 7px; | ||
439 | |||
440 | .badge-icon-pro { | ||
441 | fill: white; | ||
442 | } | ||
443 | } | ||
444 | |||
436 | &:hover { | 445 | &:hover { |
437 | background: darken($theme-gray-lightest, 5%); | 446 | background: darken($theme-gray-lightest, 5%); |
438 | 447 | ||
439 | .badge { background: #FFF; } | 448 | .badge { |
449 | background: #FFF; | ||
450 | } | ||
440 | } | 451 | } |
441 | 452 | ||
442 | &.is-active { | 453 | &.is-active { |