Skip to content

Commit

Permalink
FTR
Browse files Browse the repository at this point in the history 
- Merge conflict from work office commits
  • Loading branch information
@sk5
sk5 committed Jun 15, 2019
2 parents cdeb1ff + 513aaa2 commit 7107606
Show file tree
Hide file tree
Showing 12 changed files with 289 additions and 192 deletions.
5 changes: 5 additions & 0 deletions BC-Contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,9 @@ <h2 class="content__sub-title">Thank you!</h2>
</form>
</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>
</div>
</div>
8 changes: 4 additions & 4 deletions BC-Home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ <h3 class="feature__item--name">{{ product.name }}</h3> <!-- product-list-item-n
</p>
<a class="button large" href="/mission">Learn how</a>
</div>
<div class="callout__social">
<a href="https://www.instagram.com/forthe.run/" target="_blank" class="ig__brand">
<a class="callout__social" href="https://www.instagram.com/forthe.run/" target="_blank">
<div class="ig__brand">
<span class="ig__brand--logo">
<svg width="36" height="36" xmlns="http://www.w3.org/2000/svg">
<g fill-rule="evenodd">
Expand All @@ -82,6 +82,6 @@ <h3 class="feature__item--name">{{ product.name }}</h3> <!-- product-list-item-n
<span class="ig__brand--name">forthe.run</span>
say hello on instagram
</span>
</a>
</div>
</div>
</a>
</div>
14 changes: 9 additions & 5 deletions BC-Layout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,17 @@
<li{% if page.full_url contains '/products' or page.full_url contains '/product/' or page.full_url contains '/category/' or page.full_url contains '/artist/' %} class="navigation__list-item selected" {% else %} class="navigation__list-item" {% endif %}>
<a class="navigation__link" href="/products">{{ pages.products.name }}</a>
</li>
<!--
{% for page in pages.all limit:theme.nav_items %}
<li{% if page.full_url contains page.url %} class="navigation__list-item selected" {% else %} class="navigation__list-item" {% endif %}>
{{ page | link_to }}
</li>
{% endfor %}
<li{% if page.full_url contains '/contact' %} class="navigation__list-item selected" {% else %} class="navigation__list-item" {% endif %}>
<a class="navigation__link" href="/contact">Contact</a>
{% endfor %}-->
<li{% if page.full_url contains '/mission' or page.full_url contains '/mission/' %} class="navigation__list-item selected" {% else %} class="navigation__list-item" {% endif %}>
<a class="navigation__link" href="/mission">Mission</a>
</li>
<li{% if page.full_url contains '/contact' %} class="navigation__list-item selected" {% else %} class="navigation__list-item" {% endif %}>
<a class="navigation__link" href="/contact">Contact</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -227,11 +231,11 @@ <h1 class="custom-page-header page-title has-dash">{{ page.name }}</h1>
</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>
{% for page in pages.all %}
<li class="footer__navigation--list-item">{{ page | link_to }}</li>
{% endfor %}
<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>
{% if theme.show_search %}
<li class="">
<a class="open-search" href="#" title="Open search">Search</a>
Expand Down
164 changes: 89 additions & 75 deletions about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,72 @@ <h1 class="feature__title">

<!---->

<h2>What was For The Run created?</h2>
<p>This is an incredible community of people. If there is a way we can lift people up or bring more joy to fellow runners, we are in! Our aim is to be transparent with how we give back, so stay tuned!</p>
<p>As we continue to grow we will be sure to keep you updated about when and how we donate.</p>
<p>
We want to keep this simple!
At least 50% of every product we sell will give back.
</p>
<h2>Who or what will we give to?</h2>
<ul>
<li>Donate to charity runners</li>
<li>Donate to charity races</li>
<li>Buy race entries to giveaway</li>
<li>Buy gear to giveaway</li>
<li>Find any other ways we can help runners</li>
</ul>
<h2>Ways we plan to give back</h2>
<ul class="content__charity-breakdown">
<li class="charity--example">
<strong>4 shirts</strong>
<span> = </span>
Donation to a runner's charity
</li>
<li class="charity--example">
<strong>12 shirts</strong>
<span> = </span>
Pay for a half marathon race entry
</li>
<li class="charity--example">
<strong>24 shirts</strong>
<span> = </span>
Pay for a marathon race entry
</li>
<li class="charity--example">
<strong>Weekly causes</strong>
<span> = </span>
All proceeds for that week go to a cause
</li>
<li class="charity--example">
<strong>Merch for a cause</strong>
<span> = </span>
All proceeds from a product will go to a cause
</li>
</ul>
<p>Have ideas for how we can give back? Let us know!</p>
<a href="/contact" class="button large positive">Contact us</a>
<p>-<br><strong>For The Run</strong></p>

<!---->

We want to keep this simple! Every product we sell means we can give back to the running community.

WHO OR WHAT WILL WE GIVE TO?
Donate to charity runners
Donate to charity races
Buy race entries to giveaway
Buy gear to giveaway
Find any other ways we can help runners
HOW MUCH WILL WE GIVE?
At least 50% of the proceeds of every order will go back to runners.

This is an incredible community of people. If there is a way we can lift people up or bring more joy to fellow runners, we are in! Our aim is to be transparent with how we give back, so stay tuned!

As we continue to grow we will be sure to keep you updated about when and how we donate.

<!---->

<div class="content">
<header class="content__header">
<h2 class="content__title">
Expand Down Expand Up @@ -88,88 +154,36 @@ <h4>Breakdowns</h4>
</div>

<!--<footer class="module__footer">
I am the footer
</footer>-->
I am the footer
</footer>-->
<!-- -->
<!--<h2>What are we about?</h2>
<p>
Helping runners!
</p>-->
<p>
Helping runners!
</p>-->
<!--<p>
Running is a passion sport. We love it. You love it.
</p>
<p>
Our proceeds will either go to helping runners meet their fundraising goals or towards races that are raising funds.
</p>-->
Running is a passion sport. We love it. You love it.
</p>
<p>
Our proceeds will either go to helping runners meet their fundraising goals or towards races that are raising funds.
</p>-->
<!--<h3>
How we plan to help.
</h3>
<p>
We plan to create rad-tastic merch for this wonderful running community!
Like slapping stickers on things?
So do we!
Need some more shirts for before, during, or after your run?
Can we ever have enough? Is that really a question?
</p>
<p>
Stay tuned for what's to come!
</p>
<p>- For the run</p>-->
How we plan to help.
</h3>
<p>
We plan to create rad-tastic merch for this wonderful running community!
Like slapping stickers on things?
So do we!
Need some more shirts for before, during, or after your run?
Can we ever have enough? Is that really a question?
</p>
<p>
Stay tuned for what's to come!
</p>
<p>- For the run</p>-->

</div>
</div>
</body>

</html>


<p><span class="mission__hashtag">#runners4runners</span> - That hashtag is where this all started. Runners support each other, motivate each other, and prove to their bodies and their minds that they can do more. For the Run is an extension of these things. We aim to provide runners with wonderful products and in turn take at least 50% of what we make and give back.</p>
<p>Races can take us to travel to new places. Causes often come up that remind us why we run and motivate us to do more to help those both near and far. This community both humbles and inspires. It reminds us that we are both fragile and unbreakable. We are runners.</p>
<p>So what is our mission? We want to help. We want to give away race entries to help runners have amazing new adventures! We want to help others where help is needed. We want to take the joy and love that this community generates and amplify it.</p>
<p>Train for your run. Be ready for your run. Remember why you run. Love every step</p>
<p>We are For the Run. We are for your run. We were all built for this. Let’s keep going.</p>
<span class="mission__heart">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72">
<path d="M36 55.9l18-18c2.3-2.3 3.7-5.5 3.7-9 0-7-5.7-12.8-12.8-12.8-3.5 0-6.7 1.4-9 3.7-2.3-2.3-5.5-3.7-9-3.7-7 0-12.8 5.7-12.8 12.8 0 3.5 1.4 6.7 3.7 9l18.2 18z" fill="#303030" />
</svg>
</span>
<p>For the Run</p>



<h2>Why was For The Run created?</h2>
<p>The running community is filled with amazing people who come from a seemingly unlimited number of backgrounds. No matter the reason, we all share a passion for lacing up our shoes and getting our legs moving. Running has given us so much back in both our lives and the people who inspire us.</p>
<p>For the Run is an opportunity for us to take the joy running has given us and send that back out into the world. We want this to be something that becomes a part of the running community. We can't wait to see where you all take us!</p>
<h2>How will we give back</h2>
<p>At least 50% of every product we sell will go towards helping runners or the causes they care about.</p>
<h2>Ways we plan to give back</h2>
<ul class="content__charity-breakdown">
<li class="charity--example">
<strong>4 shirts</strong>
<span> = </span>
Donation to a runner's charity
</li>
<li class="charity--example">
<strong>12 shirts</strong>
<span> = </span>
Give away a half marathon race entry
</li>
<li class="charity--example">
<strong>24 shirts</strong>
<span> = </span>
Give away a marathon race entry
</li>
<li class="charity--example">
<strong>Weekly causes</strong>
<span> = </span>
Proceeds for that week go to a cause
</li>
<li class="charity--example">
<strong>Merch for a cause</strong>
<span> = </span>
Proceeds from a product will go to a cause
</li>
</ul>
<p>Have ideas for how we can give back? Let us know!</p>
<a href="/contact" class="button large positive">Contact us</a>
<p>-<br><strong>For the Run</strong></p>
26 changes: 24 additions & 2 deletions assets/css/_components.callouts.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,33 @@
}
}
//
position: relative;
justify-content: center;
background: $green;
background-image: linear-gradient(135deg, lighten($green, 10%) 0%, darken($green, 30%) 100%);
text-decoration: none;
background: linear-gradient(135deg, lighten($green, 10%) 0%, darken($green, 30%) 100%);
//
&:before {
content: "";
transition: opacity .5s ease;
position: absolute;
z-index: 1;
top: 0;
left: 0;
width: 100%;
height: 100%;
opacity: 0;
background: linear-gradient(135deg, lighten($green, 1%) 0%, darken($green, 40%) 100%);
}
//
&:hover {
&:before {
opacity: 1;
}
}
//
.ig__brand {
position: relative;
z-index: 1;
display: inline-block;
//padding-top: 2rem;
width: 100%;
Expand Down
Loading

0 comments on commit 7107606

Please sign in to comment.