Skip to content

Commit

Permalink
FTR
Browse files Browse the repository at this point in the history 
- CSS/JS changes to enable pre-ordering
- Added Images for the Your Inner Voice Collection
- General fixes to some old bugs
  • Loading branch information
@sk5
sk5 committed Jan 13, 2020
1 parent 7107606 commit e385363
Show file tree
Hide file tree
Showing 19 changed files with 4,127 additions and 598 deletions.
Binary file modified .vs/fortherun/v15/.suo
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions BC-Cart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ <h1 class="cart__title has-dash">{{ page.name }}</h1>
<div class="cart__content">
<h2 class="content__sub-title">Your shopping cart needs some friends</h2>
<p class="cart--empty-message">
Uhh, looks like either you haven't added anything to your cart or someone has run off with it!<br /><br />
Head back to the products page and give your cart something to do!
It looks like either you haven't added anything to your cart or someone has run off with it!<br /><br />
Head back to the products page and put your cart to work!
</p>
<a class="button positive large" href="/products" title="Start shopping">Go shopping!</a>
</div>
Expand Down
10 changes: 7 additions & 3 deletions BC-Contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,12 @@ <h2 class="content__sub-title">Thank you!</h2>
</div>
{% endif %}
<div class="content__additional--contact">
<h3 class="content__sub-title">Need to return or exchange something?</h3>
<p>View our Return & Exchange policy</p>
<p>Give us a call: 304-314-4667</p>
<h3 class="content__sub-title">Returns & Exchanges</h3>
<p>If there is an issue with your order let us know!</p>
<a class="button positive" href="/returns-and-exchanges">View our Return & Exchange policy</a>
<div class="content__phone--contact">
<h3 class="content__sub-title">Give us a call</h3>
<p>304-314-4667</p>
</div>
</div>
</div>
7 changes: 6 additions & 1 deletion BC-Home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ <h2 class="feature__title">What's new</h2>
<div class="feature__item--headers">
<!-- product-list-item-info-headers -->
{% if product_status != blank %}<div class="feature__item--status {{ product_status }}">{{ product_status }}</div>{% endif %} <!-- product-list-item-status -->
{% for category in product.categories %}
{% if category.name contains 'Pre-Order' %}
<div class="feature__item--status pre-order">Pre-Order</div>
{% endif %}
{% endfor %}
<h3 class="feature__item--name">{{ product.name }}</h3> <!-- product-list-item-name -->
<div class="feature__item--price">{{ product.default_price | money: theme.money_format }}</div> <!-- product-list-item-price -->
</div>
Expand All @@ -66,7 +71,7 @@ <h3 class="feature__item--name">{{ product.name }}</h3> <!-- product-list-item-n
<strong>gives back</strong><br />
to runners
</p>
<a class="button large" href="/mission">Learn how</a>
<a class="button large" href="/giving-back">Learn how</a>
</div>
<a class="callout__social" href="https://www.instagram.com/forthe.run/" target="_blank">
<div class="ig__brand">
Expand Down
80 changes: 44 additions & 36 deletions BC-Layout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,40 +174,48 @@ <h1 class="custom-page-header page-title has-dash">{{ page.name }}</h1>
<!--END FOR-->
{% endfor %}
{% endcapture %}
{% endfor %}
<!--3-->
{% endif %}
<!--2-->
{% endif %}

<div class="similar__products--wrapper">
{% if product_divs != blank %}
<div class="all-similar-products">{{ product_divs }}</div>
<div class="similar__products">
<div class="similar__products--header">
<div class="similar__products--title">Check these out</div>
<!--{% if product.previous_product != blank or product.next_product != blank %}
<ul class="prev-next-products">

{% if category.products.size > 1 %}
<div class="similar__products--wrapper">
{% if product_divs != blank %}
<div class="all-similar-products">{{ product_divs }}</div>
<div class="similar__products">
<div class="similar__products--header">
<div class="similar__products--title">Check these out</div>
<!--{% if product.previous_product != blank or product.next_product != blank %}
<ul class="prev-next-products">
{% if product.previous_product != blank %}
<li>{{ product.previous_product | link_to: "Previous product" }}</li>{% endif %}
{% if product.next_product != blank %}
<li>{{ product.next_product | link_to: "Next product" }}</li>{% endif %}
</ul>
{% endif %}-->
</div>
<!-- Needs "similar-product-list -->
<div class="product-list similar-product-list similar__product--list"></div>
<!-- TRYING TO HIDE SIMILAR PRODUCTS WHEN THERE ARE NO OTHER SIMILAR PRODUCTS
{{ product.categories }}
{{ categories.shirts.products | size }}
-->
</div>
{% endif %}
<!--{% if product.previous_product != blank or product.next_product != blank %}
<ul class="prev-next-products {% if product_divs != blank %}with-related{% endif %}">
{% if product.previous_product != blank %}
<li>{{ product.previous_product | link_to: "Previous product" }}</li>{% endif %}
{% if product.next_product != blank %}
<li>{{ product.next_product | link_to: "Next product" }}</li>{% endif %}
</ul>
{% endif %}-->
</div>
<!-- Needs "similar-product-list -->
<div class="product-list similar-product-list similar__product--list"></div>
{% endif %}-->
</div>
{% endif %}
<!--{% if product.previous_product != blank or product.next_product != blank %}
<ul class="prev-next-products {% if product_divs != blank %}with-related{% endif %}">
{% if product.previous_product != blank %}
<li>{{ product.previous_product | link_to: "Previous product" }}</li>{% endif %}
{% if product.next_product != blank %}
<li>{{ product.next_product | link_to: "Next product" }}</li>{% endif %}
</ul>
{% endif %}-->
</div>
{% endif %}

{% endfor %}
<!--3-->
{% endif %}
<!--2-->
{% endif %}
<!-- -->
<!--1-->
{% endif %}
</div>
Expand All @@ -217,8 +225,8 @@ <h1 class="custom-page-header page-title has-dash">{{ page.name }}</h1>
<nav class="footer-nav" id="footer">
<ul class="footer__navigation">
<li class="footer__navigation--list-item">
<a class="footer__navigation--link brand" href="/">
<svg class="ftr__logo" id="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 144 21.6">
<a class="footer__navigation--link brand" title="Back to For The Run home page" href="/">
<svg class="ftr__logo" alt="For The Run Logo" id="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 144 21.6">
<path class="ftr__logo--f" id="footer-F" d="M2.9 2c0-.3.2-.5.5-.5h11.2c.3 0 .5.2.5.5v3c0 .3-.2.5-.5.5H7.1v3.9h6.2c.3 0 .5.2.5.5v3c0 .3-.2.5-.5.5H7.1V20c0 .3-.2.5-.5.5H3.4c-.3 0-.5-.2-.5-.5V2z" fill="#ffa357" />
<path class="ftr__logo--heart" id="footer-Heart" d="M25.8 1.2c5.4 0 9.8 4.4 9.8 9.8s-4.3 9.8-9.8 9.8S16 16.5 16 11s4.4-9.8 9.8-9.8zm0 15.2c3 0 5.4-2.4 5.4-5.4 0-3-2.4-5.5-5.4-5.5-3 0-5.4 2.5-5.4 5.5s2.4 5.4 5.4 5.4z" />
<path class="ftr__logo--o" id="footer-O" d="M25.8 14.4l2.5-2.5c.3-.3.5-.8.5-1.3 0-1-.8-1.8-1.8-1.8-.5 0-.9.2-1.3.5-.2-.3-.7-.5-1.2-.5-1 0-1.8.8-1.8 1.8 0 .5.2.9.5 1.3l2.6 2.5z" />
Expand All @@ -230,9 +238,9 @@ <h1 class="custom-page-header page-title has-dash">{{ page.name }}</h1>
</svg>
</a>
</li>
<li class="footer__navigation--list-item"><a class="footer__navigation--link" href="/products">{{ pages.products.name }}</a></li>
<li class="footer__navigation--list-item"><a class="footer__navigation--link" href="/contact">Contact</a></li>
<li class="footer__navigation--list-item"><a class="footer__navigation--link" href="/cart">Cart {% if cart.item_count > 0 %}<span class="footer__navigation--total">({{ cart.item_count }})</span>{% endif %}</a></li>
<li class="footer__navigation--list-item"><a class="footer__navigation--link" title="Products page" href="/products">{{ pages.products.name }}</a></li>
<li class="footer__navigation--list-item"><a class="footer__navigation--link" title="Contact page" href="/contact">Contact</a></li>
<li class="footer__navigation--list-item"><a class="footer__navigation--link" title="View your cart" href="/cart">Cart {% if cart.item_count > 0 %}<span class="footer__navigation--total">({{ cart.item_count }})</span>{% endif %}</a></li>
{% for page in pages.all %}
<li class="footer__navigation--list-item">{{ page | link_to }}</li>
{% endfor %}
Expand All @@ -246,9 +254,9 @@ <h1 class="custom-page-header page-title has-dash">{{ page.name }}</h1>
</li>
{% endif %}
</ul>
{% if store.website != blank %}
<a href="{{ store.website }}" class="button back-to-site">Back to site</a>
{% endif %}
<!--{% if store.website != blank %}
<a href="{{ store.website }}" class="button back-to-site">Back to site</a>
{% endif %}-->
</nav>
{% if theme.twitter_url != blank or theme.facebook_url != blank or theme.instagram_url != blank or theme.tumblr_url != blank or theme.pinterest_url != blank %}
<ul class="social--links">
Expand Down
Loading

0 comments on commit e385363

Please sign in to comment.