diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/auth/Welcome.js | 2 | ||||
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 8 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 2 | ||||
-rw-r--r-- | src/lib/Menu.js | 8 | ||||
-rw-r--r-- | src/stores/AppStore.js | 4 | ||||
-rw-r--r-- | src/styles/welcome.scss | 9 |
6 files changed, 24 insertions, 9 deletions
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index eb9fbb847..9e1c762a5 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js | |||
@@ -46,7 +46,7 @@ export default class Login extends Component { | |||
46 | </div> | 46 | </div> |
47 | </div> | 47 | </div> |
48 | <div className="welcome__buttons"> | 48 | <div className="welcome__buttons"> |
49 | <Link to={signupRoute} className="button"> | 49 | <Link to={signupRoute} className="button button__inverted"> |
50 | {intl.formatMessage(messages.signupButton)} | 50 | {intl.formatMessage(messages.signupButton)} |
51 | </Link> | 51 | </Link> |
52 | <Link to={loginRoute} className="button"> | 52 | <Link to={loginRoute} className="button"> |
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 00e888cc4..67c2731fc 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -139,17 +139,17 @@ export default class EditServiceScreen extends Component { | |||
139 | 139 | ||
140 | // More fine grained and use case specific validation rules | 140 | // More fine grained and use case specific validation rules |
141 | if (recipe.hasTeamId && recipe.hasCustomUrl) { | 141 | if (recipe.hasTeamId && recipe.hasCustomUrl) { |
142 | config.fields.team.validate = [oneRequired(['team', 'customUrl'])]; | 142 | config.fields.team.validators = [oneRequired(['team', 'customUrl'])]; |
143 | config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])]; | 143 | config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])]; |
144 | } | 144 | } |
145 | 145 | ||
146 | // If a service can be hosted and has a teamId or customUrl | 146 | // If a service can be hosted and has a teamId or customUrl |
147 | if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) { | 147 | if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) { |
148 | if (config.fields.team) { | 148 | if (config.fields.team) { |
149 | config.fields.team.validate = []; | 149 | config.fields.team.validators = []; |
150 | } | 150 | } |
151 | if (config.fields.customUrl) { | 151 | if (config.fields.customUrl) { |
152 | config.fields.customUrl.validate = [url]; | 152 | config.fields.customUrl.validators = [url]; |
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 3c09fca3b..d5c0ea441 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -159,6 +159,8 @@ | |||
159 | "settings.app.form.autoLaunchInBackground": "Open in background", | 159 | "settings.app.form.autoLaunchInBackground": "Open in background", |
160 | "settings.app.form.enableSystemTray": "Show Franz in system tray", | 160 | "settings.app.form.enableSystemTray": "Show Franz in system tray", |
161 | "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", | 161 | "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", |
162 | "settings.app.form.enableMenuBar": "Show Franz in Menu Bar", | ||
163 | "settings.app.form.hideDockIcon": "Hide Franz icon in Dock", | ||
162 | "settings.app.form.runInBackground": "Keep Franz in background when closing the window", | 164 | "settings.app.form.runInBackground": "Keep Franz in background when closing the window", |
163 | "settings.app.form.language": "Language", | 165 | "settings.app.form.language": "Language", |
164 | "settings.app.form.enableSpellchecking": "Enable spell checking", | 166 | "settings.app.form.enableSpellchecking": "Enable spell checking", |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index d01666d49..703060dc1 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -22,10 +22,14 @@ const template = [ | |||
22 | role: 'cut', | 22 | role: 'cut', |
23 | }, | 23 | }, |
24 | { | 24 | { |
25 | role: 'copy', | 25 | label: 'Copy', |
26 | accelerator: 'Cmd+C', | ||
27 | selector: 'copy:', | ||
26 | }, | 28 | }, |
27 | { | 29 | { |
28 | role: 'paste', | 30 | label: 'Paste', |
31 | accelerator: 'Cmd+V', | ||
32 | selector: 'paste:', | ||
29 | }, | 33 | }, |
30 | { | 34 | { |
31 | role: 'pasteandmatchstyle', | 35 | role: 'pasteandmatchstyle', |
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 22a396033..9b59f01d2 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -358,8 +358,8 @@ export default class AppStore extends Store { | |||
358 | console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount); | 358 | console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount); |
359 | setTimeout(() => this._reactivateServices(retryCount + 1), 5000); | 359 | setTimeout(() => this._reactivateServices(retryCount + 1), 5000); |
360 | } else { | 360 | } else { |
361 | console.debug('reactivateServices: reload all services'); | 361 | console.debug('reactivateServices: reload Franz'); |
362 | this.actions.service.reloadAll(); | 362 | window.location.reload(); |
363 | } | 363 | } |
364 | } | 364 | } |
365 | 365 | ||
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss index 46299b966..a12069ba4 100644 --- a/src/styles/welcome.scss +++ b/src/styles/welcome.scss | |||
@@ -55,6 +55,15 @@ | |||
55 | background: #FFF; | 55 | background: #FFF; |
56 | color: $theme-brand-primary; | 56 | color: $theme-brand-primary; |
57 | } | 57 | } |
58 | |||
59 | &__inverted { | ||
60 | background: #FFF; | ||
61 | color: $theme-brand-primary; | ||
62 | } | ||
63 | &__inverted:hover { | ||
64 | background: none; | ||
65 | color: #FFF; | ||
66 | } | ||
58 | } | 67 | } |
59 | 68 | ||
60 | &__featured-services { | 69 | &__featured-services { |