From e021c9f38d0060aaf8a2f25e9ba4e877ddad659d Mon Sep 17 00:00:00 2001
From: Erik Christensen <32500994+BC-EChristensen@users.noreply.github.com>
Date: Sat, 29 Sep 2018 17:25:49 -0700
Subject: [PATCH] Revert "MERC-4097 Copy changes, rearrange Payment Buttons
 section"

---
 schema.json | 100 +++++++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/schema.json b/schema.json
index 3437a2e30a..71c38d28f0 100644
--- a/schema.json
+++ b/schema.json
@@ -364,7 +364,7 @@
         "type": "select",
         "id": "product_list_display_mode",
         "force_reload": true,
-        "label": "Display style",
+        "label": "Display Style",
         "options": [
           {
             "value": "grid",
@@ -878,7 +878,7 @@
       },
       {
         "type": "select",
-        "label": "Seal size",
+        "label": "Seal Size",
         "id": "geotrust_ssl_seal_size",
         "options": [
           {
@@ -903,7 +903,7 @@
       },
       {
         "type": "checkbox",
-        "label": "Show carousel",
+        "label": "Show Carousel",
         "force_reload": true,
         "id": "homepage_show_carousel"
       },
@@ -964,7 +964,7 @@
       },
       {
         "type": "select",
-        "label": "Number of featured products",
+        "label": "Number of Featured Products",
         "id": "homepage_featured_products_count",
         "force_reload": true,
         "options": [
@@ -1024,7 +1024,7 @@
       },
       {
         "type": "select",
-        "label": "Number of most popular products",
+        "label": "Number of Most Popular Products",
         "id": "homepage_top_products_count",
         "force_reload": true,
         "options": [
@@ -1084,7 +1084,7 @@
       },
       {
         "type": "select",
-        "label": "Number of new products",
+        "label": "Number of New Products",
         "id": "homepage_new_products_count",
         "force_reload": true,
         "options": [
@@ -1280,6 +1280,11 @@
          "force_reload": true,
          "id": "show_product_reviews_tabs"
       },
+      {
+        "type": "color",
+        "label": "Wishlist dropdown background",
+        "id": "dropdown--wishList-backgroundColor"
+      },
       {
         "type": "select",
         "label": "Number of product reviews",
@@ -1338,11 +1343,6 @@
           }
         ]
       },
-      {
-        "type": "color",
-        "label": "Wishlist dropdown background",
-        "id": "dropdown--wishList-backgroundColor"
-      },
       {
         "type": "heading",
         "content": "Number of products displayed"
@@ -1918,6 +1918,13 @@
         "label": "Use background image",
         "id": "optimizedCheckout-show-backgroundImage"
       },
+      {
+        "type": "color",
+        "label": "Background color",
+        "reference": "optimizedCheckout-show-backgroundImage",
+        "reference_default": false,
+        "id": "optimizedCheckout-header-backgroundColor"
+      },
       {
         "type": "optimizedCheckout-image",
         "label": "1000 x 400px recommended",
@@ -1943,11 +1950,6 @@
           }
         ]
       },
-      {
-        "type": "color",
-        "label": "Background color",
-        "id": "optimizedCheckout-header-backgroundColor"
-      },
       {
         "type": "color",
         "label": "Header text color",
@@ -2025,7 +2027,7 @@
       },
       {
         "type": "heading",
-        "content": "Discount banner"
+        "content": "Discount Banner"
       },
       {
         "type": "color",
@@ -2184,7 +2186,7 @@
       },
       {
         "type": "color",
-        "label": "Focus color",
+        "label": "Focus Color",
         "id": "optimizedCheckout-colorFocus"
       },
       {
@@ -2580,11 +2582,11 @@
       },
       {
         "type": "heading",
-        "content": "Form checklist"
+        "content": "Form Checklist"
       },
       {
         "type": "color",
-        "label": "Background color",
+        "label": "Background Color",
         "id": "optimizedCheckout-formChecklist-backgroundColor"
       },
       {
@@ -2604,7 +2606,7 @@
       },
       {
         "type": "heading",
-        "content": "Loading toaster"
+        "content": "Loading Toaster"
       },
       {
         "type": "color",
@@ -2623,20 +2625,24 @@
       "enable": "smartButtons",
       "settings": [
           {
-            "type": "checkbox",
-            "label": "Show Paypal tagline",
-            "force_reload": true,
-            "id": "paymentbuttons-paypal-tagline"
-          },
-          {
-            "type": "checkbox",
-            "label": "Show funding icons",
-            "force_reload": true,
-            "id": "paymentbuttons-paypal-fundingicons"
+              "type": "select",
+              "label": "Layout",
+              "id": "paymentbuttons-paypal-layout",
+              "force_reload": true,
+              "options": [
+                {
+                  "value": "horizontal",
+                  "label": "Horizontal"
+                },
+                {
+                  "value": "vertical",
+                  "label": "Vertical"
+                }
+              ]
           },
           {
               "type": "select",
-              "label": "Button color",
+              "label": "Color",
               "id": "paymentbuttons-paypal-color",
               "force_reload": true,
               "options": [
@@ -2660,7 +2666,7 @@
           },
           {
               "type": "select",
-              "label": "Button shape",
+              "label": "Shape",
               "id": "paymentbuttons-paypal-shape",
               "force_reload": true,
               "options": [
@@ -2676,7 +2682,7 @@
           },
           {
               "type": "select",
-              "label": "Button size",
+              "label": "Size",
               "id": "paymentbuttons-paypal-size",
               "force_reload": true,
               "options": [
@@ -2700,7 +2706,7 @@
           },
           {
               "type": "select",
-              "label": "Button content",
+              "label": "Display Label",
               "id": "paymentbuttons-paypal-label",
               "force_reload": true,
               "options": [
@@ -2723,20 +2729,16 @@
               ]
           },
           {
-            "type": "select",
-            "label": "Display style",
-            "id": "paymentbuttons-paypal-layout",
-            "force_reload": true,
-            "options": [
-              {
-                "value": "horizontal",
-                "label": "Show buttons horizontally"
-              },
-              {
-                "value": "vertical",
-                "label": "Show buttons vertically"
-              }
-            ]
+              "type": "checkbox",
+              "label": "Display the Paypal Tagline",
+              "force_reload": true,
+              "id": "paymentbuttons-paypal-tagline"
+          },
+          {
+              "type": "checkbox",
+              "label": "Display the Funding Icons",
+              "force_reload": true,
+              "id": "paymentbuttons-paypal-fundingicons"
           }
       ]
   }