diff options
author | Guille Cura <cura.gf@gmail.com> | 2018-07-05 02:37:43 -0300 |
---|---|---|
committer | Guille Cura <cura.gf@gmail.com> | 2018-07-05 02:37:43 -0300 |
commit | 25c6cbd29aff90f694d72afe28ab56b0113fb16a (patch) | |
tree | 9907623b3a7b835e58b895d08b62c5339b8e0376 /src/components | |
parent | 5.0.0 beta.18 (diff) | |
download | ferdium-app-25c6cbd29aff90f694d72afe28ab56b0113fb16a.tar.gz ferdium-app-25c6cbd29aff90f694d72afe28ab56b0113fb16a.tar.zst ferdium-app-25c6cbd29aff90f694d72afe28ab56b0113fb16a.zip |
Update stylesheets and added darkMode variable and toggle.
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/auth/AuthLayout.js | 4 | ||||
-rw-r--r-- | src/components/layout/AppLayout.js | 4 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 2741b8a15..105cae375 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -20,6 +20,7 @@ export default class AuthLayout extends Component { | |||
20 | isAPIHealthy: PropTypes.bool.isRequired, | 20 | isAPIHealthy: PropTypes.bool.isRequired, |
21 | retryHealthCheck: PropTypes.func.isRequired, | 21 | retryHealthCheck: PropTypes.func.isRequired, |
22 | isHealthCheckLoading: PropTypes.bool.isRequired, | 22 | isHealthCheckLoading: PropTypes.bool.isRequired, |
23 | darkMode: PropTypes.bool.isRequired | ||
23 | }; | 24 | }; |
24 | 25 | ||
25 | static contextTypes = { | 26 | static contextTypes = { |
@@ -35,11 +36,12 @@ export default class AuthLayout extends Component { | |||
35 | isAPIHealthy, | 36 | isAPIHealthy, |
36 | retryHealthCheck, | 37 | retryHealthCheck, |
37 | isHealthCheckLoading, | 38 | isHealthCheckLoading, |
39 | darkMode | ||
38 | } = this.props; | 40 | } = this.props; |
39 | const { intl } = this.context; | 41 | const { intl } = this.context; |
40 | 42 | ||
41 | return ( | 43 | return ( |
42 | <div className="auth"> | 44 | <div className={"auth" + (darkMode ? 'theme__dark' : '')}> |
43 | {!isOnline && ( | 45 | {!isOnline && ( |
44 | <InfoBar | 46 | <InfoBar |
45 | type="warning" | 47 | type="warning" |
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 746775a7f..9ae73c336 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -58,6 +58,7 @@ export default class AppLayout extends Component { | |||
58 | areRequiredRequestsSuccessful: PropTypes.bool.isRequired, | 58 | areRequiredRequestsSuccessful: PropTypes.bool.isRequired, |
59 | retryRequiredRequests: PropTypes.func.isRequired, | 59 | retryRequiredRequests: PropTypes.func.isRequired, |
60 | areRequiredRequestsLoading: PropTypes.bool.isRequired, | 60 | areRequiredRequestsLoading: PropTypes.bool.isRequired, |
61 | darkMode: PropTypes.bool.isRequired | ||
61 | }; | 62 | }; |
62 | 63 | ||
63 | static defaultProps = { | 64 | static defaultProps = { |
@@ -85,12 +86,13 @@ export default class AppLayout extends Component { | |||
85 | areRequiredRequestsSuccessful, | 86 | areRequiredRequestsSuccessful, |
86 | retryRequiredRequests, | 87 | retryRequiredRequests, |
87 | areRequiredRequestsLoading, | 88 | areRequiredRequestsLoading, |
89 | darkMode | ||
88 | } = this.props; | 90 | } = this.props; |
89 | 91 | ||
90 | const { intl } = this.context; | 92 | const { intl } = this.context; |
91 | 93 | ||
92 | return ( | 94 | return ( |
93 | <div> | 95 | <div className={(darkMode ? 'theme__dark' : '')}> |
94 | <div className="app"> | 96 | <div className="app"> |
95 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} | 97 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} |
96 | <div className="app__content"> | 98 | <div className="app__content"> |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 97f535594..3659310c4 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -161,6 +161,7 @@ export default class EditSettingsForm extends Component { | |||
161 | <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2> | 161 | <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2> |
162 | <Toggle field={form.$('showDisabledServices')} /> | 162 | <Toggle field={form.$('showDisabledServices')} /> |
163 | <Toggle field={form.$('showMessageBadgeWhenMuted')} /> | 163 | <Toggle field={form.$('showMessageBadgeWhenMuted')} /> |
164 | <Toggle field={form.$('darkMode')} /> | ||
164 | 165 | ||
165 | {/* Language */} | 166 | {/* Language */} |
166 | <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2> | 167 | <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2> |