From 8ac4e5ab47d3f3ef5850bfa691e290906a8b289a Mon Sep 17 00:00:00 2001
From: Peter Zimon <peterzimon@MacBook-Pro-2.local>
Date: Mon, 6 Jul 2020 16:07:22 +0200
Subject: [PATCH] Rearranged accent color in settings

no refs.

- moved accent color setting to section top in Settings/General according to its importance
---
 .../admin/app/templates/settings/general.hbs  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/ghost/admin/app/templates/settings/general.hbs b/ghost/admin/app/templates/settings/general.hbs
index 55dce41026..502944a4fa 100644
--- a/ghost/admin/app/templates/settings/general.hbs
+++ b/ghost/admin/app/templates/settings/general.hbs
@@ -99,7 +99,32 @@
 
         <div class="gh-setting-header">Publication identity</div>
         <div class="flex flex-column br3 shadow-1 bg-grouped-table pa5">
-            <div class="gh-setting-first" data-test-setting="icon">
+            {{#if this.config.enableDeveloperExperiments}}
+                <div class="gh-setting-first" data-test-setting="accent-color">
+                    <div class="gh-setting-content">
+                        <div class="gh-setting-title">Accent Color</div>
+                        <div class="gh-setting-desc">Primary color used in your publication theme</div>
+                    </div>
+                    <div class="gh-setting-action">
+                        <GhFormGroup @errors={{settings.errors}} @hasValidated={{settings.hasValidated}} @property="accentColor" @class="input-color-form-group">
+                            <div class="input-color">
+                                <GhTextInput
+                                    @name="accent-color"
+                                    @placeholder="abcdef"
+                                    @autocorrect="off"
+                                    @maxlength="6"
+                                    @focus-out={{action "validateAccentColor"}}
+                                    @value={{accentColor}}
+                                    data-test-input="accentColor"
+                                />
+                                <div class="color-box" style={{this.backgroundStyle}}></div>
+                            </div>
+                            <GhErrorMessage @errors={{settings.errors}} @property="accentColor" data-test-error="accentColor" />
+                        </GhFormGroup>
+                    </div>
+                </div>
+            {{/if}}
+            <div class="{{if this.config.enableDeveloperExperiments "gh-setting" "gh-setting-first"}}" data-test-setting="icon">
                 <GhUploader
                     @extensions={{this.iconExtensions}}
                     @paramsHash={{hash purpose="icon"}}
@@ -164,31 +189,6 @@
                 </div>
                 </GhUploader>
             </div>
-            {{#if this.config.enableDeveloperExperiments}}
-                <div class="gh-setting" data-test-setting="accent-color">
-                    <div class="gh-setting-content">
-                        <div class="gh-setting-title">Accent Color</div>
-                        <div class="gh-setting-desc">Primary color used in your publication theme</div>
-                    </div>
-                    <div class="gh-setting-action">
-                        <GhFormGroup @errors={{settings.errors}} @hasValidated={{settings.hasValidated}} @property="accentColor" @class="input-color-form-group">
-                            <div class="input-color">
-                                <GhTextInput
-                                    @name="accent-color"
-                                    @placeholder="abcdef"
-                                    @autocorrect="off"
-                                    @maxlength="6"
-                                    @focus-out={{action "validateAccentColor"}}
-                                    @value={{accentColor}}
-                                    data-test-input="accentColor"
-                                />
-                                <div class="color-box" style={{this.backgroundStyle}}></div>
-                            </div>
-                            <GhErrorMessage @errors={{settings.errors}} @property="accentColor" data-test-error="accentColor" />
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/if}}
             <div class="gh-setting-last" data-test-setting="coverImage">
                 <GhUploader
                     @extensions={{this.imageExtensions}}