Update general color settings (#31)

Elkfox · Apr 24, 2018 · c3b53db · c3b53db
1 parent ddc7d02
commit c3b53db
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 35 deletions.
diff --git a/src/config/settings_schema.json b/src/config/settings_schema.json
@@ -7,6 +7,30 @@
     "theme_documentation_url": "https://shopify.github.io/slate/",
     "theme_support_url": "https://github.com/Shopify/slate"
   },
+  {
+    "name": "Colors",
+    "settings": [
+      {
+        "type": "color",
+        "id": "color_accent",
+        "label": "Accent",
+        "default": "#c4cdd5",
+        "info": "Buttons and special ornaments"
+      },
+      {
+        "type": "color",
+        "id": "color_body_text",
+        "label": "Text",
+        "default": "#161d25"
+      },
+      {
+        "type": "color",
+        "id": "color_main_bg",
+        "label": "Background",
+        "default": "#fff"
+      }
+    ]
+  },
   {
     "name": "Typography",
     "settings": [
@@ -36,36 +60,6 @@
       }
     ]
   },
-  {
-    "name": "Colors",
-    "settings": [
-      {
-        "type": "header",
-        "content": "General colors"
-      },
-      {
-        "type": "color",
-        "id": "color_primary",
-        "label": "Primary color",
-        "default": "#ffdab9",
-        "info": "Used for text links, and primary buttons"
-      },
-      {
-        "type": "color",
-        "id": "color_body_text",
-        "label": "Text color",
-        "default": "#444",
-        "info": "Color used for content and paragraph text"
-      },
-      {
-        "type": "color",
-        "id": "color_main_bg",
-        "label": "Background Color",
-        "default": "#fff",
-        "info": "Main background color"
-      }
-    ]
-  },
   {
     "name": "Social media",
     "settings": [

diff --git a/src/layout/gift_card.liquid b/src/layout/gift_card.liquid
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1">
-  <meta name="theme-color" content="{{ settings.color_primary }}">
+  <meta name="theme-color" content="{{ settings.color_accent }}">
   <link rel="canonical" href="{{ canonical_url }}">
 
   {% if settings.favicon != blank %}

diff --git a/src/layout/password.liquid b/src/layout/password.liquid
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1">
-  <meta name="theme-color" content="{{ settings.color_primary }}">
+  <meta name="theme-color" content="{{ settings.color_accent }}">
   <link rel="canonical" href="{{ canonical_url }}">
 
   {% if settings.favicon != blank %}

diff --git a/src/layout/theme.liquid b/src/layout/theme.liquid
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1">
-  <meta name="theme-color" content="{{ settings.color_primary }}">
+  <meta name="theme-color" content="{{ settings.color_accent }}">
   <link rel="canonical" href="{{ canonical_url }}">
 
   {%- if settings.favicon != blank -%}

diff --git a/src/snippets/css-variables.liquid b/src/snippets/css-variables.liquid
@@ -1,7 +1,7 @@
 <style>
   :root {
-    --color-primary: {{ settings.color_primary }};
+    --color-primary: {{ settings.color_accent }};
     --color-body-text: {{ settings.color_body_text }}
     --color-main-background: {{ settings.color_main_bg }};
   }
-</style>
+</style>