diff options
-rw-r--r-- | src/components/ui/AppLoader.js | 2 | ||||
-rw-r--r-- | src/components/ui/Loader.js | 5 | ||||
-rw-r--r-- | src/config.js | 2 | ||||
-rw-r--r-- | src/stores/SettingsStore.js | 8 | ||||
-rw-r--r-- | src/styles/tabs.scss | 4 |
5 files changed, 14 insertions, 7 deletions
diff --git a/src/components/ui/AppLoader.js b/src/components/ui/AppLoader.js index 64a212969..ac3cdcb05 100644 --- a/src/components/ui/AppLoader.js +++ b/src/components/ui/AppLoader.js | |||
@@ -8,7 +8,7 @@ export default function () { | |||
8 | <div className="app-loader"> | 8 | <div className="app-loader"> |
9 | <Appear> | 9 | <Appear> |
10 | <h1 className="app-loader__title">Franz</h1> | 10 | <h1 className="app-loader__title">Franz</h1> |
11 | <Loader /> | 11 | <Loader color="#FFF" /> |
12 | </Appear> | 12 | </Appear> |
13 | </div> | 13 | </div> |
14 | ); | 14 | ); |
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js index e4fbd96a2..f73296bb6 100644 --- a/src/components/ui/Loader.js +++ b/src/components/ui/Loader.js | |||
@@ -9,12 +9,14 @@ export default class LoaderComponent extends Component { | |||
9 | children: oneOrManyChildElements, | 9 | children: oneOrManyChildElements, |
10 | loaded: PropTypes.bool, | 10 | loaded: PropTypes.bool, |
11 | className: PropTypes.string, | 11 | className: PropTypes.string, |
12 | color: PropTypes.string, | ||
12 | }; | 13 | }; |
13 | 14 | ||
14 | static defaultProps = { | 15 | static defaultProps = { |
15 | children: null, | 16 | children: null, |
16 | loaded: false, | 17 | loaded: false, |
17 | className: '', | 18 | className: '', |
19 | color: '#373a3c', | ||
18 | }; | 20 | }; |
19 | 21 | ||
20 | render() { | 22 | render() { |
@@ -22,6 +24,7 @@ export default class LoaderComponent extends Component { | |||
22 | children, | 24 | children, |
23 | loaded, | 25 | loaded, |
24 | className, | 26 | className, |
27 | color, | ||
25 | } = this.props; | 28 | } = this.props; |
26 | 29 | ||
27 | return ( | 30 | return ( |
@@ -30,7 +33,7 @@ export default class LoaderComponent extends Component { | |||
30 | // lines={10} | 33 | // lines={10} |
31 | width={4} | 34 | width={4} |
32 | scale={0.6} | 35 | scale={0.6} |
33 | color="#373a3c" | 36 | color={color} |
34 | component="span" | 37 | component="span" |
35 | className={className} | 38 | className={className} |
36 | > | 39 | > |
diff --git a/src/config.js b/src/config.js index 4c7363439..60cc6fd7e 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -7,7 +7,7 @@ export const GA_ID = 'UA-74126766-6'; | |||
7 | export const DEFAULT_APP_SETTINGS = { | 7 | export const DEFAULT_APP_SETTINGS = { |
8 | autoLaunchOnStart: true, | 8 | autoLaunchOnStart: true, |
9 | autoLaunchInBackground: false, | 9 | autoLaunchInBackground: false, |
10 | runInBackground: false, | 10 | runInBackground: true, |
11 | enableSystemTray: true, | 11 | enableSystemTray: true, |
12 | minimizeToSystemTray: false, | 12 | minimizeToSystemTray: false, |
13 | showDisabledServices: true, | 13 | showDisabledServices: true, |
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 331df5c15..ad3c53ccf 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
@@ -35,9 +35,13 @@ export default class SettingsStore extends Store { | |||
35 | 35 | ||
36 | @action async _update({ settings }) { | 36 | @action async _update({ settings }) { |
37 | await this.updateSettingsRequest.execute(settings)._promise; | 37 | await this.updateSettingsRequest.execute(settings)._promise; |
38 | await this.allSettingsRequest.invalidate({ immediately: true }); | 38 | this.allSettingsRequest.patch((result) => { |
39 | if (!result) return; | ||
40 | Object.assign(result, settings); | ||
41 | }); | ||
39 | 42 | ||
40 | this._shareSettingsWithMainProcess(); | 43 | // We need a little hack to wait until everything is patched |
44 | setTimeout(() => this._shareSettingsWithMainProcess(), 0); | ||
41 | 45 | ||
42 | gaEvent('Settings', 'update'); | 46 | gaEvent('Settings', 'update'); |
43 | } | 47 | } |
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss index 8347de3b4..3ffc53558 100644 --- a/src/styles/tabs.scss +++ b/src/styles/tabs.scss | |||
@@ -67,8 +67,8 @@ | |||
67 | padding: 0px 5px; | 67 | padding: 0px 5px; |
68 | font-size: 11px; | 68 | font-size: 11px; |
69 | position: absolute; | 69 | position: absolute; |
70 | right: 5px; | 70 | right: 8px; |
71 | bottom: 5px; | 71 | bottom: 8px; |
72 | display: flex; | 72 | display: flex; |
73 | justify-content: center; | 73 | justify-content: center; |
74 | align-items: center; | 74 | align-items: center; |