rounding out the contribute page

build/_includes/contribute.html

@@ -1,38 +1,45 @@
-<section id="contribute">
+<section>
-  <h2 class="page-header">Contribute Icons to Font Awesome</h2>
+  <h2 class="page-header">GitHub Project</h2>
+  <p class="lead">
+    Found a bug? Want to request a new icon? Want to see what's up next for the project?
+    <a href="{{ site.font-awesome.github.url }}/issues">Submit an issue</a> on the
+    <a href="{{ site.font-awesome.github.url }}">GitHub project</a>. Here are a few guidelines:
+  </p>
+  <ol>
+    <li>Be nice. No one likes a jackass.</li>
+    <li>Check to see if your issue you want to open already exists. Search is a beautiful invention. <i class="icon-smile"></i></li>
+    <li>
+      If you're making a request for a new icon, it's helpful if you include the following:
+      <ul>
+        <li>Title your request <code>Icon request: icon-name</code></li>
+        <li>Icon use cases. How do you want to be using it?</li>
+        <li>Attach an image or two that represent the idea you're going for. Remember that font icons are a single color.</li>
+      </ul>
+    </li>
+  </ol>
+
+</section>
+
+<section id="say-thanks">
+  <h2 class="page-header">Say Thanks</h2>
+  <p class="lead">
+    Hopefully you think Font Awesome <em>is</em> awesome. I've put hundreds of hours into the project to give back to the
+    open source community. If you'd like, here are a couple of ways you can tell me thanks for all my hard work.
+  </p>
   <div class="row">
-    <div class="span3">
+    <div class="span6">
-      <img class="img-rounded" src="assets/img/contribution-sample.png">
+      <h3><a href="http://www.shareagift.com/pages/giftpage.aspx?giftid=2472" target="_blank">Help me buy an iMac</a></h3>
-    </div>
-    <div class="span9">
-      <p class="lead">
-        Want to help make Font Awesome even more awesome? Contribute back to the Font Awesome community by designing
-        new pictograms for the set.
-      </p>
       <p>
-        If selected, you'll retain the CC-BY license to your pictogram and get attribution
+        <a href="http://www.shareagift.com/pages/giftpage.aspx?giftid=2472" target="_blank">Contribute</a> to a shiny
-        right here on the Font Awesome site.
+        new iMac for me to keep making great icons.
+      </p>
+    </div>
+    <div class="span6">
+      <h3><a href="http://amzn.com/w/G64X58AY416W" target="_blank">My Amazon Wish List</a></h3>
+      <p>
+        Or pick something straight
+        from <a href="http://amzn.com/w/G64X58AY416W" target="_blank">my wish list</a>. Gift cards are great.
       </p>
-      <h3>How to Submit New Icons</h3>
-      <ol>
-        <li>Download the <a href="assets/img/icon-flag.pdf">icon-flag.pdf template</a>.</li>
-        <li>
-          Open the PDF in Adobe Illustrator. You'll notice the file has dimensions of 60x56. This is exactly 4x the
-          max icon size of 15 wide by 14 tall. The template is an example of the flag icon to use as a guide.
-        </li>
-        <li>
-          Design your icon. In order to make it into the set, your icon must look pixel perfect. The easiest way to do
-          this is to make sure your line widths in the template are some multiple of 4px. Diagonals are rough, too.
-          Don't split pixels right down the middle, as they blur more when rendering. Zoom out to 25% to get a good idea
-          of how it will render in the font.
-        </li>
-        <li>
-          Submit your icon. Drop me an email at <a href="mailto:dave@davegandy.com">dave@davegandy.com</a>. Make sure to
-          use the subject <code>[Font Awesome] [Icon Contribution] icon-name</code> and attach your PDF file. If your
-          icon makes it into Font Awesome (I'm keeping a very tight reign on quality), I'll ask what contact info you'd
-          like to use for attribution.
-        </li>
-      </ol>
     </div>
   </div>
 </section>

build/_includes/get-started.html

@@ -20,8 +20,8 @@
     <li>
       Paste the following code into the <code>&lt;head&gt;</code> section of your site's HTML.
 {% highlight html %}
-<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
+<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/{{ site.bootstrap.version }}/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
-<link href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" rel="stylesheet">
+<link href="//netdna.bootstrapcdn.com/font-awesome/{{ site.font-awesome.version }}/css/font-awesome.css" rel="stylesheet">
 {% endhighlight %}
       <div class="alert alert-info margin-top">
         <i class="icon-info-sign"></i> Want to use Font Awesome by itself without Bootstrap? Just skip pasting in the first line.
@@ -45,7 +45,10 @@
     <li>Copy font-awesome.min.css into your project.</li>
     <li>
       Open your project's font-awesome.min.css and edit the font paths to ensure they point to the right place.
-      <p class="alert alert-info"><i class="icon-info-sign"></i> The font path is relative from your CSS directory.</p>
+      <p class="alert alert-info">
+        <i class="icon-info-sign"></i> The font path is relative from your CSS directory. If you're having an issue
+        getting Font Awesome icons to load, this is likely the issue.
+      </p>
     </li>
     <li>
       In the <code>&lt;head&gt;</code> of your html, reference the location to your font-awesome.min.css.

build/_includes/icons/medical.html

@@ -1,6 +1,6 @@
 <section id="icons-medical" class="row">
   <div class="span12">
-    <h2 class="page-header">Medical Icons <small>Want to change healthcare? Work with me at <a href="#kyruus">Kyruus</a>.</small></h2>
+    <h2 class="page-header">Medical Icons</h2>
   </div>
   <div class="span3">
     <ul class="the-icons">

build/_includes/navbar.html

@@ -8,8 +8,8 @@
         <li{% if page.navbar_active == "icons" %} class="active"{% endif %}><a href="{{ site.baseurl }}icons/">Icons</a></li>
         <li{% if page.navbar_active == "examples" %} class="active"{% endif %}><a href="{{ site.baseurl }}examples/">Examples</a></li>
         <li{% if page.navbar_active == "whats-new" %} class="active"{% endif %}><a href="{{ site.baseurl }}whats-new/">What's New</a></li>
+        <li{% if page.navbar_active == "contribute" %} class="active"{% endif %}><a href="{{ site.baseurl }}contribute/">Contribute</a></li>
         <li{% if page.navbar_active == "roadmap" %} class="active"{% endif %}><a href="{{ site.baseurl }}roadmap/">Roadmap</a></li>
-        <li{% if page.navbar_active == "thanks" %} class="active"{% endif %}><a href="{{ site.baseurl }}thanks/">Say Thanks</a></li>
       </ul>
       <ul class="nav pull-right">
         <li><a href="mailto:{{ site.font-awesome.author.email }}"><i class="icon-envelope"></i> Me</a></li>

build/_includes/say-thanks.html

@@ -1,22 +0,0 @@
-<section id="say-thanks">
-  <p class="lead">
-    Hopefully you think Font Awesome <em>is</em> awesome. I've put hundreds of hours into the project to give back to the
-    open source community. If you'd like, here are a couple of ways you can tell me thanks for all my hard work.
-  </p>
-  <div class="row">
-    <div class="span6">
-      <h4><a href="http://www.shareagift.com/pages/giftpage.aspx?giftid=2472" target="_blank">Help me buy an iMac</a></h4>
-      <p>
-        <a href="http://www.shareagift.com/pages/giftpage.aspx?giftid=2472" target="_blank">Contribute</a> to a shiny
-        new iMac for me to keep making great icons.
-      </p>
-    </div>
-    <div class="span6">
-      <h4><a href="http://amzn.com/w/G64X58AY416W" target="_blank">My Amazon Wish List</a></h4>
-      <p>
-        Or pick something straight
-        from <a href="http://amzn.com/w/G64X58AY416W" target="_blank">my wish list</a>. Gift cards are great.
-      </p>
-    </div>
-  </div>
-</section>

build/contribute/index.html

@@ -0,0 +1,14 @@
+---
+layout: base
+title: How to Contribute to Font Awesome
+navbar_active: contribute
+---
+{% capture jumbotron_h1 %}<i class="icon-thumbs-up icon-large"></i>&nbsp; Contribute{% endcapture %}
+{% capture jumbotron_p %}A few ways to get involved with Font Awesome{% endcapture %}
+
+{% include jumbotron.html %}
+{% include stripe-social.html %}
+
+<div class="container">
+  {% include contribute.html %}
+</div>

build/thanks/index.html

@@ -1,14 +0,0 @@
----
-layout: base
-title: Say Thanks
-navbar_active: thanks
----
-{% capture jumbotron_h1 %}<i class="icon-thumbs-up icon-large"></i>&nbsp; Say Thanks{% endcapture %}
-{% capture jumbotron_p %}Like Font Awesome? Here's some ways to tell me thanks.{% endcapture %}
-
-{% include jumbotron.html %}
-{% include stripe-social.html %}
-
-<div class="container">
-  {% include say-thanks.html %}
-</div>