aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/components/auth/Welcome.js2
-rw-r--r--src/containers/settings/EditServiceScreen.js8
-rw-r--r--src/stores/AppStore.js4
-rw-r--r--src/styles/welcome.scss9
4 files changed, 16 insertions, 7 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/stores/AppStore.js b/src/stores/AppStore.js
index 06c43f83f..dc5a04c46 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -364,8 +364,8 @@ export default class AppStore extends Store {
364 console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount); 364 console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
365 setTimeout(() => this._reactivateServices(retryCount + 1), 5000); 365 setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
366 } else { 366 } else {
367 console.debug('reactivateServices: reload all services'); 367 console.debug('reactivateServices: reload Franz');
368 this.actions.service.reloadAll(); 368 window.location.reload();
369 } 369 }
370 } 370 }
371 371
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 {