chore: merge develop in

This commit is contained in:
CuriousMagpie
2022-09-16 16:12:34 -04:00
parent 014a4b653a
commit 719fab8d4b
73 changed files with 1297 additions and 1017 deletions
@@ -94,7 +94,6 @@
</div>
</div>
<div class="box payment-providers">
<h3>Choose your payment method</h3>
<payments-buttons
:stripe-fn="() => pay(PAYMENTS.STRIPE)"
:amazon-data="pay(PAYMENTS.AMAZON)"
@@ -167,6 +166,11 @@
.purple-box {
color: #bda8ff;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-top-left-radius: 8px;
border-bottom-left-radius: 8px;
box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
}
.number {
@@ -180,6 +184,8 @@
.payment-providers {
width: 350px;
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;
}
}
@@ -304,6 +310,10 @@
.payment-options {
margin-bottom: 64px;
h4 {
color: #34313a;
}
.purple-box {
background-color: #4f2a93;
color: #fff;