From 24607321a64f0c1652a383949dde169ca7443239 Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Tue, 13 Jan 2015 09:23:01 -0500 Subject: [PATCH 1/2] Removed failed cart properties liquid --- assets/timber.scss.liquid | 2 +- templates/cart.liquid | 34 ++++++++++++++++------------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid index 6a3364bd3..8be7eb852 100755 --- a/assets/timber.scss.liquid +++ b/assets/timber.scss.liquid @@ -989,7 +989,7 @@ hr { } } -.rte-header { +.rte--header { margin-bottom: 0; } diff --git a/templates/cart.liquid b/templates/cart.liquid index 3dcdb0987..050e3dab5 100755 --- a/templates/cart.liquid +++ b/templates/cart.liquid @@ -80,24 +80,22 @@ For more info on line item properties, visit: - http://docs.shopify.com/support/your-store/products/how-do-I-collect-additional-information-on-the-product-page-Like-for-a-monogram-engraving-or-customization {% endcomment %} - {% if item.properties.size > 0 %} - {% for p in item.properties %} - {% unless p.last == blank %} - {{ p.first }}: - - {% comment %} - Check if there was an uploaded file associated - {% endcomment %} - {% if p.last contains '/uploads/' %} - {{ p.last | split: '/' | last }} - {% else %} - {{ p.last }} - {% endif %} - -
- {% endunless %} - {% endfor %} - {% endif %} + {% for p in item.properties %} + {% unless p.last == blank %} + {{ p.first }}: + + {% comment %} + Check if there was an uploaded file associated + {% endcomment %} + {% if p.last contains '/uploads/' %} + {{ p.last | split: '/' | last }} + {% else %} + {{ p.last }} + {% endif %} + +
+ {% endunless %} + {% endfor %} {{ 'cart.general.remove' | t }} From 53b28d58ad1e2ee8ace86e7c4533f4ce1cd47c3b Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Mon, 19 Jan 2015 10:23:03 -0500 Subject: [PATCH 2/2] Better cart property check --- templates/cart.liquid | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/templates/cart.liquid b/templates/cart.liquid index 050e3dab5..d6d47d1fa 100755 --- a/templates/cart.liquid +++ b/templates/cart.liquid @@ -80,22 +80,25 @@ For more info on line item properties, visit: - http://docs.shopify.com/support/your-store/products/how-do-I-collect-additional-information-on-the-product-page-Like-for-a-monogram-engraving-or-customization {% endcomment %} - {% for p in item.properties %} - {% unless p.last == blank %} - {{ p.first }}: - - {% comment %} - Check if there was an uploaded file associated - {% endcomment %} - {% if p.last contains '/uploads/' %} - {{ p.last | split: '/' | last }} - {% else %} - {{ p.last }} - {% endif %} - -
- {% endunless %} - {% endfor %} + {% assign propertySize = item.properties | size %} + {% if propertySize > 0 %} + {% for p in item.properties %} + {% unless p.last == blank %} + {{ p.first }}: + + {% comment %} + Check if there was an uploaded file associated + {% endcomment %} + {% if p.last contains '/uploads/' %} + {{ p.last | split: '/' | last }} + {% else %} + {{ p.last }} + {% endif %} + +
+ {% endunless %} + {% endfor %} + {% endif %} {{ 'cart.general.remove' | t }}