From 2165d55e66539f3c027497a2f1e4d2de75148721 Mon Sep 17 00:00:00 2001 From: Shawn King Date: Fri, 6 Mar 2020 08:01:59 -0500 Subject: [PATCH] FTR - Pittsburgh Collection Updates --- .vs/fortherun/v15/.suo | Bin 17408 -> 17408 bytes BC-Home.html | 15 +- BC-Layout.html | 168 ++--- BC-Product-13020.html | 396 +++++++++++ BC-Product.html | 14 +- BC-Products.html | 67 +- assets/css/_components.button.scss | 82 +++ assets/css/_components.content.scss | 13 - assets/css/_components.modules.scss | 7 - assets/css/_components.product.scss | 62 -- assets/css/_components.products-listing.scss | 137 ++-- assets/css/_generic.normalize.scss | 5 +- assets/css/styles.css | 693 +++++++++---------- assets/css/styles.min.css | 2 +- assets/css/styles.scss | 3 +- assets/images/Pittsburgh-Collection-Logo.png | Bin 0 -> 20934 bytes 16 files changed, 1049 insertions(+), 615 deletions(-) create mode 100644 BC-Product-13020.html delete mode 100644 assets/css/_components.modules.scss create mode 100644 assets/images/Pittsburgh-Collection-Logo.png diff --git a/.vs/fortherun/v15/.suo b/.vs/fortherun/v15/.suo index 4d788bed385bc99a0865fdc2bd3172f5426f2578..8f4035cd30cf03c02fcd721712f38dc7363ec1bd 100644 GIT binary patch delta 1943 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 NvU(UZIQmQYzX9c(wv+$> diff --git a/BC-Home.html b/BC-Home.html index 68a4223..a9a970f 100644 --- a/BC-Home.html +++ b/BC-Home.html @@ -9,12 +9,15 @@ {% endif %}-->
-

Runners
giving back
to runners

- {% if theme.image_sets.slideshow.size > 0 %} + +

+

Pre-Orders Begin January 17th

+
{% if theme.featured_items > 0 %} @@ -47,9 +50,9 @@

What's new

{% if product_status != blank %}
{{ product_status }}
{% endif %} {% for category in product.categories %} - {% if category.name contains 'Pre-Order' %} -
Pre-Order
- {% endif %} + {% if category.name contains 'Pre-Order' %} +
Pre-Order
+ {% endif %} {% endfor %}

{{ product.name }}

{{ product.default_price | money: theme.money_format }}
diff --git a/BC-Layout.html b/BC-Layout.html index c26a891..131ca2b 100644 --- a/BC-Layout.html +++ b/BC-Layout.html @@ -37,21 +37,21 @@
+ + -->
+ + {% if theme.images.header != blank %} + + {% else %} +
{{ store.name }}
+ {% endif %} + + --> + + -->
@@ -174,48 +174,62 @@

{{ page.name }}

{% endfor %} {% endcapture %} - - {% if category.products.size > 1 %} -
- {% if product_divs != blank %} -
{{ product_divs }}
-
-
-
Check these out
- -
- -
- -
- {% endif %} - -
- {% endif %} - {% endfor %} {% endif %} {% endif %} - +
+ {% if product_divs != blank %} +
{{ product_divs }}
+
+
+
Check these out
+
+ +
+
+ {% endif %} +
+ {% for category in product.categories %} + {% if category.name contains 'Pre-Order' %} + + {% endif %} + {% if category.name contains 'Tanks' %} + + {% endif %} + {% if category.name contains 'Shirts' %} + + {% endif %} + {% if category.name contains 'Stickers' %} + + {% endif %} + {% endfor %} {% endif %} diff --git a/BC-Product-13020.html b/BC-Product-13020.html new file mode 100644 index 0000000..fb1765c --- /dev/null +++ b/BC-Product-13020.html @@ -0,0 +1,396 @@ +{% assign product_status = '' %} +{% case product.status %} + {% when 'active' %} + {% if product.on_sale %}{% assign product_status = 'On sale' %}{% endif %} + {% when 'sold-out' %} + {% assign product_status = 'Sold out' %} + {% when 'coming-soon' %} + {% assign product_status = 'Coming soon' %} +{% endcase %} +
+ +
+

{{ product.name }}

+ {% for category in product.categories %} + + {% if category.name == 'Pre-Order' %} + Pre-Order + {% endif %} + {% endfor %} + {% if product_status != blank %}{{ product_status }}{% endif %} +
+ + +
+ +
    + {% for image in product.images %} + +
  • Image of {{ product.name | escape }}
    • + {% endfor %} +
+
    + {% for image in product.images %} +
  • + + + + +
    • + {% endfor %} +
+
+ +
+ {% for category in product.categories %} + + {% if category.name == 'Pre-Order' %} +

+ Available for + Pre-Order +

+ {% endif %} + + {% if category.name == 'Pre-Order' %} + {% for option in product.options %} + + + {% endfor %} + + + +
+
+ / +
+ {% for category in product.categories %} + {% if category.name == 'Shirts' %} +

Pre-orders for this shirt are open for two weeks. If it meets the 6 shirt minimum, it will ship to you about two weeks after the pre-order ends.

+ {% endif %} + {% if category.name == 'Tanks' %} +

Pre-orders for this tank are open for two weeks. If it meets the 6 tank minimum, it will ship to you about two weeks after the pre-order ends.

+ {% endif %} + {% if category.name == 'Stickers' %} +

Pre-orders for this sticker are open for two weeks. If it meets the 6 sticker minimum, it will ship to you about two weeks after the pre-order ends.

+ {% endif %} + {% endfor %} +

If an item does not meet the order minimum you will be fully refunded.

+
+ {% endif %} + + {% endfor %} + {% if product.description != blank %} +

Description

+
+ {{ product.description | paragraphs }} +
+ {% endif %} + + +
+ + {% if product.status == 'active' %} + {% if theme.show_inventory_bars %} +
+
Availability
+
    + {% for option in product.options %} +
  • + + {% unless product.has_default_option %}
    {{ option.name }}
    {% endunless %} + + +
    {{ option.quantity }}
    +
    in stock
    + +
    • + {% endfor %} +
+
+ {% endif %} + +
+ + {% if product.has_default_option %} + {{ product.option | hidden_option_input }} + {% else %} +
+ + + + {% for category in product.categories %} + {% if category.name == 'Shirts' %} + + {% endif %} + {% if category.name == 'Tanks' %} + + {% endif %} + {% if category.name == 'Stickers' %} + + {% endif %} + {% endfor %} + + + + +
+ +
+ {% endif %} +
+
+
{{ product.default_price | money: theme.money_format }}
+ +
+
+ {% endif %} + + + + {% if theme.show_facebook or theme.show_twitter or theme.show_pinterest %} + + {% endif %} +
+
+
+ + \ No newline at end of file diff --git a/BC-Product.html b/BC-Product.html index f1f105e..f5ad385 100644 --- a/BC-Product.html +++ b/BC-Product.html @@ -273,7 +273,7 @@

Description

} document.getElementById("total").value = sum; if (sum > 5) { - document.getElementsByClassName('pre-order--sold')[0].innerHTML = "Pre-Order minimum met!"; + document.getElementsByClassName('pre-order--sold')[0].innerHTML = "Pre-Order met!"; } else { document.getElementsByClassName('pre-order--sold')[0].innerHTML = "" + sum + " sold"; } @@ -329,8 +329,9 @@

Description

var dateCreated = "{{ product.created_at }}"; var dateSplit = dateCreated.replace(' ', '-').split('-'); var yearCreated = dateSplit[0]; - var dayCreated = dateSplit[1]; - var monthCreated = dateSplit[2]; + var monthCreated = dateSplit[1]; + var dayCreated = dateSplit[2]; + console.log(dateCreated); // //Set 1 day in milliseconds var one_day = 1000*60*60*24 @@ -353,6 +354,7 @@

Description

// // Show the results of DateDiff to make sure the math is right console.log("You have " + DateDiff(createdDate, currentDate) + " left"); + console.log(new Date(createdDate).getTime() + (14 * one_day)); // // If the number of days left if 0 // The DateDiff function makes the "createdDate the deadline date @@ -368,6 +370,12 @@

Description

// // // + if (window.location.href.indexOf("testing") > -1) { + console.log("your url contains testing"); + } + // + // + // //function findTotal(){ //var arr = document.getElementsByClassName('option-sold'); //var tot=0; diff --git a/BC-Products.html b/BC-Products.html index cc433d8..a69a41e 100644 --- a/BC-Products.html +++ b/BC-Products.html @@ -6,7 +6,7 @@

Products

  • Everything
    • {% for category in categories.active %} -
  • {{ category | link_to }}
    • +
  • {{ category | link_to }}
    • {% endfor %}
@@ -88,34 +88,34 @@

{{ product.name }}

{% endif %} {% if page.full_url contains '/products' or page.full_url contains '/shirts' %} - - {% for product in categories.shirts.products %} - {% assign product_status = '' %} - {% case product.status %} - {% when 'active' %} - {% if product.on_sale %}{% assign product_status = 'On sale' %}{% endif %} - {% when 'sold-out' %} - {% assign product_status = 'Sold out' %} - {% when 'coming-soon' %} - {% assign product_status = 'Coming soon' %} - {% endcase %} - - - -
- Image of {{ product.name | escape }} -
- -
- -
- {% if product_status != blank %}
{{ product_status }}
{% endif %} -

{{ product.name }}

-
{{ product.default_price | money: theme.money_format }}
-
-
- - {% endfor %} + + {% for product in categories.shirts.products %} + {% assign product_status = '' %} + {% case product.status %} + {% when 'active' %} + {% if product.on_sale %}{% assign product_status = 'On sale' %}{% endif %} + {% when 'sold-out' %} + {% assign product_status = 'Sold out' %} + {% when 'coming-soon' %} + {% assign product_status = 'Coming soon' %} + {% endcase %} + + + +
+ Image of {{ product.name | escape }} +
+ +
+ +
+ {% if product_status != blank %}
{{ product_status }}
{% endif %} +

{{ product.name }}

+
{{ product.default_price | money: theme.money_format }}
+
+
+ + {% endfor %} {% endif %} @@ -152,10 +152,11 @@

{{ product.name }}

{% endif %} - {% if paginate.pages > 1 %} - {{ paginate | default_pagination }} - {% endif %} - +