diff options
author | 2019-11-27 16:08:15 +0700 | |
---|---|---|
committer | 2019-11-27 16:08:15 +0700 | |
commit | e14638f2d0db12369b5de477cdc06511bbbfb6d7 (patch) | |
tree | 648228cbb7059a1022197bb2ad0a05b37f869d62 | |
parent | #168 Set empty menu when Ferdi is locked (diff) | |
download | ferdium-app-e14638f2d0db12369b5de477cdc06511bbbfb6d7.tar.gz ferdium-app-e14638f2d0db12369b5de477cdc06511bbbfb6d7.tar.zst ferdium-app-e14638f2d0db12369b5de477cdc06511bbbfb6d7.zip |
Run prepare code to fix formatting
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 18 | ||||
-rw-r--r-- | src/components/settings/team/TeamDashboard.js | 9 | ||||
-rw-r--r-- | src/lib/Menu.js | 2 |
3 files changed, 19 insertions, 10 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 12822bae0..1a54f221d 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -261,9 +261,12 @@ export default @observer class EditSettingsForm extends Component { | |||
261 | autoFocus | 261 | autoFocus |
262 | /> | 262 | /> |
263 | {isLoggedIn && ( | 263 | {isLoggedIn && ( |
264 | <p className="settings__message" style={{ | 264 | <p |
265 | borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem', | 265 | className="settings__message" |
266 | }}> | 266 | style={{ |
267 | borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem', | ||
268 | }} | ||
269 | > | ||
267 | { intl.formatMessage(messages.serverInfo) } | 270 | { intl.formatMessage(messages.serverInfo) } |
268 | </p> | 271 | </p> |
269 | )} | 272 | )} |
@@ -301,9 +304,12 @@ export default @observer class EditSettingsForm extends Component { | |||
301 | onChange={e => this.submit(e)} | 304 | onChange={e => this.submit(e)} |
302 | field={form.$('todoServer')} | 305 | field={form.$('todoServer')} |
303 | /> | 306 | /> |
304 | <p className="settings__message" style={{ | 307 | <p |
305 | borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem', | 308 | className="settings__message" |
306 | }}> | 309 | style={{ |
310 | borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem', | ||
311 | }} | ||
312 | > | ||
307 | { intl.formatMessage(messages.todoServerInfo) } | 313 | { intl.formatMessage(messages.todoServerInfo) } |
308 | </p> | 314 | </p> |
309 | </> | 315 | </> |
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 57db1dcbd..3d5358d89 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js | |||
@@ -210,9 +210,12 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon | |||
210 | <h1 className={classes.headline}> | 210 | <h1 className={classes.headline}> |
211 | {intl.formatMessage(messages.teamsUnavailable)} | 211 | {intl.formatMessage(messages.teamsUnavailable)} |
212 | </h1> | 212 | </h1> |
213 | <p className="settings__message" style={{ | 213 | <p |
214 | borderTop: 0, marginTop: 0 | 214 | className="settings__message" |
215 | }}> | 215 | style={{ |
216 | borderTop: 0, marginTop: 0, | ||
217 | }} | ||
218 | > | ||
216 | {intl.formatMessage(messages.teamsUnavailableInfo)} | 219 | {intl.formatMessage(messages.teamsUnavailableInfo)} |
217 | </p> | 220 | </p> |
218 | </div> | 221 | </div> |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index d3b13e491..b8abf80bd 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -809,7 +809,7 @@ export default class FranzMenu { | |||
809 | locked: false, | 809 | locked: false, |
810 | }, | 810 | }, |
811 | }); | 811 | }); |
812 | window.ferdi.menu.rebuild() | 812 | window.ferdi.menu.rebuild(); |
813 | setTimeout(() => { | 813 | setTimeout(() => { |
814 | actions.settings.update({ | 814 | actions.settings.update({ |
815 | type: 'app', | 815 | type: 'app', |