diff --git a/make_post_sell/static/css/common.css b/make_post_sell/static/css/common.css index 03c3975..7441b55 100644 --- a/make_post_sell/static/css/common.css +++ b/make_post_sell/static/css/common.css @@ -735,16 +735,24 @@ textarea.markup-editor-textarea { margin-right: auto; } - /* On mobile, show price section before description */ - section.product-left { - order: 2; + /* On mobile, reorder to put purchase section after images */ + .product-images { + order: 1; } section.product-right { - order: 1; + order: 2; width: 100%; } + .product-description { + order: 3; + } + + .product-comments { + order: 4; + } + /* Ensure buttons get full width on mobile */ section.product-right .mps-button { width: 100%; @@ -787,6 +795,10 @@ textarea.markup-editor-textarea { section.two-column { display: grid; grid-template-columns: 2fr 1fr; + grid-template-areas: + "images purchase" + "description purchase" + "comments purchase"; gap: 40px; max-width: 1200px; margin-left: auto; @@ -795,6 +807,22 @@ textarea.markup-editor-textarea { padding-right: 40px; align-items: start; } + + .product-images { + grid-area: images; + } + + section.product-right { + grid-area: purchase; + } + + .product-description { + grid-area: description; + } + + .product-comments { + grid-area: comments; + } /* if we have room, break markup-editor into 2 columns */ div.markup-editor { diff --git a/make_post_sell/templates/content.j2 b/make_post_sell/templates/content.j2 index da582c1..c9b0148 100644 --- a/make_post_sell/templates/content.j2 +++ b/make_post_sell/templates/content.j2 @@ -32,14 +32,12 @@
-
- +
{% if "thumbnail1" in product.extensions %} {% if product.extensions["product"] in ["mp3", "mp4", "wav", "flac", "aac", "ogg", "wma", "m4a", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v"] %}

-
click ▶ to play!
@@ -50,49 +48,45 @@
{% endif %} -

{{ product.title }}

-

- uploaded to {{ product.shop.name }} -

- -
- - Description -
{{ product.description_html | safe }}
- -
-
- - {% if product.has_product_file %} - File Type -
- {{ product.get_content_type("product") }} {{ product_size }} -
- {% endif %} - -
+

{{ product.title }} uploaded to {{ product.shop.name }}

+
- - {% if product.has_product_file %} -
- {% if signed_get_object_url is not none %} - ⭳ Download + {% if product.has_product_file %} +
+ {% if signed_get_object_url is not none %} + ⭳ Download + {% endif %} +
{% endif %} -
- {% endif %} -
-
+
+
-
- -
- - - {% include 'snippets/comments.j2' %} + Description +
{{ product.description_html | safe }}
+ +
+
+ + {% if product.has_product_file %} + File Type +
+ {{ product.get_content_type("product") }} {{ product_size }} +
+ {% endif %} +
+ +
+
+
+ + + {% include 'snippets/comments.j2' %} +
+ {%- endblock -%} diff --git a/make_post_sell/templates/product.j2 b/make_post_sell/templates/product.j2 index 2d96609..032d3f2 100644 --- a/make_post_sell/templates/product.j2 +++ b/make_post_sell/templates/product.j2 @@ -30,8 +30,7 @@
-
- +

{{ product.title }} sold by {{ product.shop.name }}

{% if "thumbnail1" in product.extensions %} @@ -45,45 +44,7 @@ {% endif %} {% endfor %} - -
-
- - Description -
{{ product.description_html | safe }}
- -
-
- - {% if product.is_bundle %} - {% if product.products_in_this_bundle %} - Bundle Contents -
    - {% for p in product.products_in_this_bundle %} -
  • - {{p.title}} -
  • - {% endfor %} -
- {% endif %} - {% elif product.has_product_file %} - File Type -
- {{ product.get_content_type("product") }} {{ product_size }} -
- Please make sure you have an application to open this file type. - {% endif %} - -
-
- - - {% include 'snippets/comments.j2' %} - -
- Back to shop - -
+
@@ -150,6 +111,47 @@
+
+
+
+ + Description +
{{ product.description_html | safe }}
+ +
+
+ + {% if product.is_bundle %} + {% if product.products_in_this_bundle %} + Bundle Contents + + {% endif %} + {% elif product.has_product_file %} + File Type +
+ {{ product.get_content_type("product") }} {{ product_size }} +
+ Please make sure you have an application to open this file type. + {% endif %} +
+ +
+
+
+ + + {% include 'snippets/comments.j2' %} + +
+ Back to shop +
+