From 2acea75db33d19a54d99f7e704246fca9e771e24 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 21 Dec 2017 16:05:39 -0800
Subject: [PATCH 1/2] Commerce: Checkout Layout Revisions

---
 .../qml/hifi/commerce/checkout/Checkout.qml     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 6b7432b8b2..6f31fc6ed2 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -410,7 +410,8 @@ Rectangle {
             Rectangle {
                 id: buyTextContainer;
                 visible: buyText.text !== "";
-                anchors.top: parent.top;
+                anchors.top: cancelPurchaseButton.bottom;
+                anchors.topMargin: 16;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
                 height: buyText.height + 30;
@@ -465,8 +466,8 @@ Rectangle {
                 enabled: (root.balanceAfterPurchase >= 0 && purchasesReceived && balanceReceived) || !itemIsJson;
                 color: hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
-                anchors.top: buyTextContainer.visible ? buyTextContainer.bottom : checkoutActionButtonsContainer.top;
-                anchors.topMargin: buyTextContainer.visible ? 12 : 16;
+                anchors.top: checkoutActionButtonsContainer.top;
+                anchors.topMargin: 16;
                 height: 40;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
@@ -926,11 +927,11 @@ Rectangle {
                 buyText.text = "";
             }
         } else {
-            buyText.text = "This free item <b>will not</b> be added to your <b>Purchases</b>. Non-entities can't yet be purchased for HFC.";
-            buyTextContainer.color = "#FFD6AD";
-            buyTextContainer.border.color = "#FAC07D";
-            buyGlyph.text = hifi.glyphs.alert;
-            buyGlyph.size = 46;
+            buyText.text = '<i>Note: This free item will not show up in "My Purchases". You can access it again later from the Marketplace.</i>';
+            buyTextContainer.color = hifi.colors.white;
+            buyTextContainer.border.color = hifi.colors.white;
+            buyGlyph.text = "";
+            buyGlyph.size = 0;
         }
     }
 

From ef71470d85737384efde4f38fe8463a3476b024a Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 21 Dec 2017 17:03:04 -0800
Subject: [PATCH 2/2] Small change

---
 interface/resources/qml/hifi/commerce/checkout/Checkout.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 6f31fc6ed2..a380632425 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -927,7 +927,7 @@ Rectangle {
                 buyText.text = "";
             }
         } else {
-            buyText.text = '<i>Note: This free item will not show up in "My Purchases". You can access it again later from the Marketplace.</i>';
+            buyText.text = '<i>This type of item cannot currently be certified, so it will not show up in "My Purchases". You can access it again for free from the Marketplace.</i>';
             buyTextContainer.color = hifi.colors.white;
             buyTextContainer.border.color = hifi.colors.white;
             buyGlyph.text = "";