From 2bba9989db44bec474f26ba48f8f5f59539acaa6 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Tue, 9 Mar 2021 20:11:07 +0000
Subject: [PATCH] Updated default settings for 4.0

- With 4.0 we have a brand new version of Casper, new fixtures and new default settings
- This all comes from the marketing and design teams to refresh the look and feel of Ghost

Note on accent color:

This commit changes the default accent colour again.

The intention is that new sites should get #FF1A75 (pink) as their default.
Any existing sites that do not have an accent colour set yet, should get #15171A (black) on upgrading to 4.0.

These are different as they are different experinces. Fresh sites will be guided to pick a color, so
a bright color is more visible and helps to see what can be done, whilst existing sites get a muted
black, that should be a sensible fall back color.
---
 core/client                                   |  2 +-
 core/server/data/schema/default-settings.json | 14 +++++++-------
 test/unit/data/schema/integrity_spec.js       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/client b/core/client
index 4d2987b65c..3c086f3031 160000
--- a/core/client
+++ b/core/client
@@ -1 +1 @@
-Subproject commit 4d2987b65cf32595ea1bd8f9a32029a652dfe532
+Subproject commit 3c086f3031e31408453f7c1b5daa0f51518c87b1
diff --git a/core/server/data/schema/default-settings.json b/core/server/data/schema/default-settings.json
index a1b206df02..948a2c796b 100644
--- a/core/server/data/schema/default-settings.json
+++ b/core/server/data/schema/default-settings.json
@@ -65,7 +65,7 @@
             "type": "string"
         },
         "description": {
-            "defaultValue": "The professional publishing platform",
+            "defaultValue": "Thoughts, stories and ideas",
             "validations": {
                 "isLength": {
                     "max": 200
@@ -75,11 +75,11 @@
             "type": "string"
         },
         "logo": {
-            "defaultValue": "https://static.ghost.org/v1.0.0/images/ghost-logo.svg",
+            "defaultValue": "",
             "type": "string"
         },
         "cover_image": {
-            "defaultValue": "https://static.ghost.org/v3.0.0/images/publication-cover.png",
+            "defaultValue": "https://static.ghost.org/v4.0.0/images/publication-cover.jpg",
             "type": "string"
         },
         "icon": {
@@ -87,7 +87,7 @@
             "type": "string"
         },
         "accent_color": {
-            "defaultValue": "#15171A",
+            "defaultValue": "#FF1A75",
             "flags": "PUBLIC",
             "validations": {
                 "isEmpty": false
@@ -122,15 +122,15 @@
             "type": "string"
         },
         "twitter": {
-            "defaultValue": "ghost",
+            "defaultValue": "@ghost",
             "type": "string"
         },
         "navigation": {
-            "defaultValue": "[{\"label\":\"Home\", \"url\":\"/\"},{\"label\":\"Tag\", \"url\":\"/tag/getting-started/\"}, {\"label\":\"Author\", \"url\":\"/author/ghost/\"},{\"label\":\"Help\", \"url\":\"https://ghost.org/docs/\"}]",
+            "defaultValue": "[{\"label\":\"Home\",\"url\":\"/\"},{\"label\":\"About\",\"url\":\"/about/\"},{\"label\":\"Collection\",\"url\":\"/tag/getting-started/\"},{\"label\":\"Author\",\"url\":\"/author/ghost/\"},{\"label\":\"Portal\",\"url\":\"/portal/\"}]",
             "type": "array"
         },
         "secondary_navigation": {
-            "defaultValue": "[]",
+            "defaultValue": "[{\"label\":\"Data & privacy\",\"url\":\"/\"},{\"label\":\"Contact\",\"url\":\"/\"},{\"label\":\"Contribute →\",\"url\":\"/\"}]",
             "type": "array"
         },
         "meta_title": {
diff --git a/test/unit/data/schema/integrity_spec.js b/test/unit/data/schema/integrity_spec.js
index c4b6cb4b88..f4d0cbde40 100644
--- a/test/unit/data/schema/integrity_spec.js
+++ b/test/unit/data/schema/integrity_spec.js
@@ -34,7 +34,7 @@ describe('DB version integrity', function () {
     // Only these variables should need updating
     const currentSchemaHash = '559cdbb49a7eeb5758caf0c6e3bf790d';
     const currentFixturesHash = '5f6f69931811c407dff01da9ef9667f4';
-    const currentSettingsHash = 'a787bc3c1812b56a498b9ac5f8900f63';
+    const currentSettingsHash = 'f18630f4e85b915766fac1aea323d26c';
     const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';
 
     // If this test is failing, then it is likely a change has been made that requires a DB version bump,