From d8e5bd9f4b65ade42e48d47d94d617df77a19a1b Mon Sep 17 00:00:00 2001
From: André Oliveira <37463445+SpecialAro@users.noreply.github.com>
Date: Thu, 5 May 2022 23:28:52 +0100
Subject: Rearrange input fields on Settings screen and add labels for
organization (#101)
---
.../settings/settings/EditSettingsForm.js | 99 ++++++++++++----------
1 file changed, 52 insertions(+), 47 deletions(-)
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 9fe229f11..2ea9272b0 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -399,6 +399,7 @@ class EditSettingsForm extends Component {
{/* General */}
{this.state.activeSetttingsTab === 'general' && (
+
Main
@@ -407,32 +408,8 @@ class EditSettingsForm extends Component {
{isWindows &&
}
{isWindows &&
}
-
-
-
-
-
-
-
- {intl.formatMessage(messages.hibernateInfo)}
-
-
-
-
-
-
-
-
{!hasAddedTodosAsService && (
<>
@@ -468,6 +445,7 @@ class EditSettingsForm extends Component {
)}
+
{scheduledDNDEnabled && (
<>
{intl.formatMessage(messages.scheduledDNDInfo)}
+
+
+
+
+
+
+
+
Hibernation
+
+
+
+ {intl.formatMessage(messages.hibernateInfo)}
+
+
+
+
+
+
)}
{/* Appearance */}
{this.state.activeSetttingsTab === 'appearance' && (
-
-
-
-
+
General UI
{isMac &&
}
-
-
{!isAdaptableDarkModeEnabled && (
@@ -554,8 +553,6 @@ class EditSettingsForm extends Component {
>
)}
-
-
{isSplitModeEnabled && (
+
this.submit(e)}
+ field={form.$('accentColor')}
+ />
+
+ {intl.formatMessage(messages.accentColorInfo, {
+ defaultAccentColor: DEFAULT_APP_SETTINGS.accentColor,
+ })}
+
+
+
+
+
Sidebar Settings
+
@@ -587,21 +599,14 @@ class EditSettingsForm extends Component {
-
-
-
+
Service Icons Settings
-
this.submit(e)}
- field={form.$('accentColor')}
- />
-
- {intl.formatMessage(messages.accentColorInfo, {
- defaultAccentColor: DEFAULT_APP_SETTINGS.accentColor,
- })}
-
+
+
+
+
+
)}
@@ -838,7 +843,7 @@ class EditSettingsForm extends Component {
)}
{updateFailed && (
- An error occurred (check the console for more details)
+ An error occurred (check the console for more details)
)}
>
@@ -857,7 +862,7 @@ class EditSettingsForm extends Component {
) : (
- Your services are up-to-date.
+ Your services are up-to-date.
)}
>
--
cgit v1.2.3-54-g00ecf