diff --git a/themes/aura/assets/express-checkout.css b/themes/aura/assets/express-checkout.css
index 5df16288..1acc2bb9 100644
--- a/themes/aura/assets/express-checkout.css
+++ b/themes/aura/assets/express-checkout.css
@@ -14,10 +14,7 @@
}
.express-checkout-fields{
- border-width:2px;
- border-style:solid;
background:#F8F8F8;
- box-shadow:1px -1px 23px rgba(0, 0, 0, 0.04);
border-radius:4px;
display:grid;
grid-template-columns:1fr;
@@ -26,12 +23,8 @@
}
@media (min-width: 768px){
.express-checkout-fields{
- border:medium none currentcolor;
- border:initial;
background:transparent none repeat 0 0 / auto auto padding-box border-box scroll;
background:initial;
- box-shadow:none;
- box-shadow:initial;
padding:0;
padding:initial;
}
@@ -199,13 +192,3 @@
padding-bottom:0;
}
}
-
-.sticky-checkout-placeholder .express-checkout-button:disabled{
- opacity:0.5;
- cursor:not-allowed;
-}
-
-.sticky-btn-placehodler{
- opacity:0.5;
- cursor:not-allowed;
-}
diff --git a/themes/aura/snippets/express-checkout.liquid b/themes/aura/snippets/express-checkout.liquid
index bcb5943e..87d13d03 100644
--- a/themes/aura/snippets/express-checkout.liquid
+++ b/themes/aura/snippets/express-checkout.liquid
@@ -13,8 +13,7 @@
}
{% endif %}
- .custom-checkout-{{ checkout_id }},
- .express-checkout-fields {
+ .custom-checkout-{{ checkout_id }} {
border: 1px solid {{ settings.form_border_colour.hex }};
}
@@ -22,8 +21,8 @@
grid-gap: {{ settings.inputs_gap }}px;
}
- .custom-checkout-{{ checkout_id }} input,
- .custom-checkout-{{ checkout_id }} textarea,
+ .custom-checkout-{{ checkout_id }} input,
+ .custom-checkout-{{ checkout_id }} textarea,
.custom-checkout-{{ checkout_id }} select {
padding: {{ settings.input_padding }}px;
border-radius: {{ settings.input_border_radius }}px;
@@ -74,8 +73,9 @@
}
{% endif %}
- .express-checkout-placeholder .express-checkout-button {
- opacity: 0.5;
+ .express-checkout-button:disabled {
+ background: #bdc3c7 !important;
+ color: #ffffff !important;
cursor: not-allowed;
}
{% endstyle %}
@@ -107,19 +107,19 @@
{% endfor %}
{% when 'textarea' %}
-
{% else %}
-
{% endcase %}
{{ block.settings.express_checkout_cta }}
+ {% render 'sticky-checkout', settings: block.settings %}
+
{% endif %}
{%- endcase -%}
{%- endfor -%}
diff --git a/themes/aura/styles/express-checkout.scss b/themes/aura/styles/express-checkout.scss
index b2543feb..bf299b54 100644
--- a/themes/aura/styles/express-checkout.scss
+++ b/themes/aura/styles/express-checkout.scss
@@ -19,10 +19,7 @@ $sticky-checkout-padding: 20px;
}
.express-checkout-fields {
- border-width: 2px;
- border-style: solid;
background: #F8F8F8;
- box-shadow: 1px -1px 23px rgba(0, 0, 0, 0.04);
border-radius: 4px;
display: grid;
grid-template-columns: 1fr;
@@ -30,9 +27,7 @@ $sticky-checkout-padding: 20px;
padding: 10px;
@include breakpoint('md') {
- border: unset;
background: unset;
- box-shadow: unset;
padding: unset;
}
}
@@ -213,15 +208,3 @@ $sticky-checkout-padding: 20px;
}
}
}
-
-.sticky-checkout-placeholder {
- .express-checkout-button:disabled {
- opacity: 0.5;
- cursor: not-allowed;
- }
-}
-
-.sticky-btn-placehodler {
- opacity: 0.5;
- cursor: not-allowed;
-}
diff --git a/themes/harmony/assets/express-checkout.css b/themes/harmony/assets/express-checkout.css
index 1a54f0eb..4c1ee139 100644
--- a/themes/harmony/assets/express-checkout.css
+++ b/themes/harmony/assets/express-checkout.css
@@ -42,7 +42,6 @@
border-width:6px;
border-style:solid;
background:#F8F8F8;
- box-shadow:1px -1px 23px rgba(0, 0, 0, 0.04);
border-radius:4px;
padding:20px;
grid-gap:18px;
@@ -53,11 +52,6 @@
}
.express-checkout-fields{
- border-width:4px;
- border-style:solid;
- background:#F8F8F8;
- box-shadow:1px -1px 23px rgba(0, 0, 0, 0.04);
- border-radius:4px;
display:grid;
grid-template-columns:1fr;
grid-gap:14px;
@@ -65,13 +59,6 @@
}
@media (min-width: 768px){
.express-checkout-fields{
- border-width:4px;
- border:medium none currentcolor;
- border:initial;
- background:transparent none repeat 0 0 / auto auto padding-box border-box scroll;
- background:initial;
- box-shadow:none;
- box-shadow:initial;
padding:0;
padding:initial;
}
@@ -218,8 +205,3 @@
padding-bottom:0;
}
}
-
-.sticky-btn-placehodler{
- opacity:0.5;
- cursor:not-allowed;
-}
diff --git a/themes/harmony/snippets/express-checkout.liquid b/themes/harmony/snippets/express-checkout.liquid
index a034aa63..764c1eee 100644
--- a/themes/harmony/snippets/express-checkout.liquid
+++ b/themes/harmony/snippets/express-checkout.liquid
@@ -14,7 +14,6 @@
{% endif %}
.custom-checkout-{{ checkout_id }},
- .express-checkout-fields,
.sticky-form-wrapper {
border: 1px solid {{ settings.form_border_colour.hex }};
}
@@ -24,8 +23,8 @@
grid-gap: {{ settings.inputs_gap }}px;
}
- .custom-checkout-{{ checkout_id }} input,
- .custom-checkout-{{ checkout_id }} textarea,
+ .custom-checkout-{{ checkout_id }} input,
+ .custom-checkout-{{ checkout_id }} textarea,
.custom-checkout-{{ checkout_id }} select {
padding: {{ settings.input_padding }}px;
border-radius: {{ settings.input_border_radius }}px;
@@ -73,7 +72,7 @@
padding: calc({{ settings.input_padding }}px - 4px);
}
- .express-checkout-placeholder .express-checkout-button {
+ .express-checkout-button:disabled {
opacity: 0.5;
cursor: not-allowed;
}
@@ -109,19 +108,19 @@
{% endfor %}
{% when 'textarea' %}
-
{% else %}
-
{% endcase %}
{{ block.settings.express_checkout_cta }}
+ {% render 'sticky-checkout', settings: block.settings %}
+
{% endif %}
{%- endcase -%}
{%- endfor -%}
diff --git a/themes/harmony/styles/express-checkout.scss b/themes/harmony/styles/express-checkout.scss
index 6e32549a..c91ecbae 100644
--- a/themes/harmony/styles/express-checkout.scss
+++ b/themes/harmony/styles/express-checkout.scss
@@ -49,7 +49,6 @@
border-width: 6px;
border-style: solid;
background: #F8F8F8;
- box-shadow: 1px -1px 23px rgba(0, 0, 0, 0.04);
border-radius: 4px;
padding: 20px;
grid-gap: 18px;
@@ -61,21 +60,12 @@
}
.express-checkout-fields {
- border-width: 4px;
- border-style: solid;
- background: #F8F8F8;
- box-shadow: 1px -1px 23px rgba(0, 0, 0, 0.04);
- border-radius: 4px;
display: grid;
grid-template-columns: 1fr;
grid-gap: 14px;
padding: 10px;
@include breakpoint('md') {
- border-width: 4px;
- border: unset;
- background: unset;
- box-shadow: unset;
padding: unset;
}
}
@@ -227,8 +217,3 @@
}
}
}
-
-.sticky-btn-placehodler {
- opacity: 0.5;
- cursor: not-allowed;
-}
diff --git a/themes/meraki/snippets/single-product-placeholder.liquid b/themes/meraki/snippets/single-product-placeholder.liquid
index ef0d20b2..2c7fa6cf 100644
--- a/themes/meraki/snippets/single-product-placeholder.liquid
+++ b/themes/meraki/snippets/single-product-placeholder.liquid
@@ -45,8 +45,10 @@
{%- when 'express_checkout' -%}
{% render 'express-checkout', checkout: checkout, is_sticky: block.settings.is_sticky, settings: block.settings, is_placeholder: is_placeholder %}
{% if block.settings.is_sticky %}
- {% render 'sticky-checkout', settings: block.settings %}
-
+ {% render 'sticky-checkout', settings: block.settings %}
+
{% endif %}
{%- endcase -%}
{%- endfor -%}