Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 21:43:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Commerce: Checkout Layout Revisions

Browse source
This commit is contained in:
Zach Fox 2017-12-21 16:05:39 -08:00
parent 91d485ff6d
commit 2acea75db3
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/resources/qml/hifi/commerce/checkout/Checkout.qml
View file

@ -410,7 +410,8 @@ Rectangle {
Rectangle { Rectangle {
id: buyTextContainer; id: buyTextContainer;
visible: buyText.text !== ""; visible: buyText.text !== "";
anchors.top: parent.top; anchors.top: cancelPurchaseButton.bottom;
anchors.topMargin: 16;
anchors.left: parent.left; anchors.left: parent.left;
anchors.right: parent.right; anchors.right: parent.right;
height: buyText.height + 30; height: buyText.height + 30;
@ -465,8 +466,8 @@ Rectangle {
enabled: (root.balanceAfterPurchase >= 0 && purchasesReceived && balanceReceived) || !itemIsJson; enabled: (root.balanceAfterPurchase >= 0 && purchasesReceived && balanceReceived) || !itemIsJson;
color: hifi.buttons.blue; color: hifi.buttons.blue;
colorScheme: hifi.colorSchemes.light; colorScheme: hifi.colorSchemes.light;
anchors.top: buyTextContainer.visible ? buyTextContainer.bottom : checkoutActionButtonsContainer.top; anchors.top: checkoutActionButtonsContainer.top;
anchors.topMargin: buyTextContainer.visible ? 12 : 16; anchors.topMargin: 16;
height: 40; height: 40;
anchors.left: parent.left; anchors.left: parent.left;
anchors.right: parent.right; anchors.right: parent.right;
@ -926,11 +927,11 @@ Rectangle {
buyText.text = ""; buyText.text = "";
} }
} else { } 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."; 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 = "#FFD6AD"; buyTextContainer.color = hifi.colors.white;
buyTextContainer.border.color = "#FAC07D"; buyTextContainer.border.color = hifi.colors.white;
buyGlyph.text = hifi.glyphs.alert; buyGlyph.text = "";
buyGlyph.size = 46; buyGlyph.size = 0;
} }
} }