Merge branch 'marketing' of github.com:zurb/ink into marketing

Conflicts:
	includes/_top-bar.php
	index.php
	sass/app.scss
	stylesheets/app.css
	templates.php

diff --cc includes/_footer.php
Simple merge

diff --cc includes/_top-bar.php
index c9c92b3b6bd6534f9162aaf0051f84aa1914f2fb,21db54f48cd4a33a5be7abf308e5c4bfe4dea0d2..91d37c3d12d5161cadcf71bd0b1f1f8ef556e31e
--- 1/includes/_top-bar.php
--- 2/includes/_top-bar.php
+++ b/includes/_top-bar.php
@@@ -9,10 -9,10 +9,10 @@@
  
    <section class="top-bar-section">
      <ul class="right">
-       <li><a href="process.php">Process</a></li>
-       <li><a href="docs.php">Docs</a></li>
-       <li><a href="inliner.php">Inliner</a></li>
-       <li><a href="templates.php">Email Templates</a></li>
+       <li<?php if ($thisPage=="process") echo " class=\"active\""; ?>><a href="process.php">Process</a></li>
+       <li<?php if ($thisPage=="docs") echo " class=\"active\""; ?>><a href="docs.php">Docs</a></li>
 -      <li<?php if ($thisPage=="templates") echo " class=\"active\""; ?>><a href="templates.php">Email Templates</a></li>
+       <li<?php if ($thisPage=="inliner") echo " class=\"active\""; ?>><a href="inliner.php">Inliner</a></li>
++      <li<?php if ($thisPage=="templates") echo " class=\"active\""; ?>><a href="templates.php">Email Templates</a></li>
        <li class="has-form"><a href="download.php" class="tiny button">Download</a></li>
      </ul>
    </section>

diff --cc index.php
index 36a7f6311bb00fc298f0031e71679da9aff44fa4,17158a2d7caa3c55a8a970a54be8f5a5d266b8df..858f7112b991d875cd350550a82d7ea15c4c8a5c
--- 1/index.php
--- 2/index.php
+++ b/index.php
@@@ -23,7 -23,11 +23,11 @@@
        <div class="home-text">
          <h1 class="light">Ink</h1>
          <p class="lead">Quickly create responsive HTML emails that work on any device &amp; client. Even Outlook.</p>
 -        <a href="download.php" class="large button">Download Ink 0.7.1</a>
 +        <a href="download.php" class="large button">Download Ink</a>
+         <ul class="header-social-links">
+           <li><a href="https://github.com/zurb/ink"><i class="fi-social-github"></i>Ink on Github</a>
+           <li><a href="https://github.com/zurb/ink"><i class="fi-social-twitter"></i>@inkzurb</a>
+         </ul>
          <div class="inky hide-for-small"></div>
        </div>
      </div>

diff --cc sass/app.scss
Simple merge

diff --cc stylesheets/app.css
index f6381a38dc862f62557f991c5ba0f782c38c4608,04272d38e31d97fefebe800187494aae8a6acb90..0a8b142107af7bff299fcdff05b16839729c57c9
--- 1/stylesheets/app.css
--- 2/stylesheets/app.css
+++ b/stylesheets/app.css
@@@ -9798,12 -11495,11 +11574,12 @@@ hr 
  .template-thumbs a {
    display: block;
  }
- /* line 195, ../sass/app.scss */
+ /* line 210, ../sass/app.scss */
  .template-thumbs a.button {
    display: inline-block;
 +  width: 45%;
  }
- /* line 196, ../sass/app.scss */
+ /* line 211, ../sass/app.scss */
  .template-thumbs a img {
    display: block;
    margin-bottom: 15px;

diff --cc templates.php
index 4ebfa791153ab012abbf3c8de6d54affd21a4d0c,5deb0d0e7fd6aec1508f27b1846e75408131a654..9a5be32161fda42ccb884b3b1bf6ab05fca642a2
--- 1/templates.php
--- 2/templates.php
+++ b/templates.php
@@@ -45,10 -39,12 +46,12 @@@
      
  <div class="row">
    <div class="small-12 columns">
-     
+     <h5 class="normal">You can download all of the templates in one file here:</h6>
+     <a href="templates/all-templates.zip" class="button primary">All Ink Templates</a>
+     <br><br>
      <ul class="large-block-grid-3 small-block-grid-1 template-thumbs">
        <li>
 -        <a href="#">
 +        <a href="downloads/templates/basic.html" target="_blank">
            <img src="images/templates/basic.jpg">
            <span class="name">Basic</span>
            <span class="description">This template is perfect for sending a basic but nice looking email to your readers.</span>