From c69092a17696b4a0ab6927d695f2fb56d65f498e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 11 Sep 2013 12:30:46 -0700
Subject: move to separate about page

---
 _layouts/default.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to '_layouts')

diff --git a/_layouts/default.html b/_layouts/default.html
index 3f1276e4e..46a5a7f55 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -38,6 +38,8 @@
                 {% include nav-javascript.html %}
               {% elsif page.slug == "customize" %}
                 {% include nav-customize.html %}
+              {% elsif page.slug == "about" %}
+                {% include nav-about.html %}
               {% endif %}
             </ul>
           </div>
-- 
cgit v1.2.3


From a8f21b5ae98bf515d79ed6b8a7bfa2d1e84ff056 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 2 Oct 2013 00:11:51 -0500
Subject: merge in new ads

---
 _layouts/home.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '_layouts')

diff --git a/_layouts/home.html b/_layouts/home.html
index 416b3e2bf..c8328feb4 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -14,6 +14,8 @@
     {{ content }}
 
     <footer class="container" role="contentinfo">
+      {% include ads.html %}
+
       {% include social-buttons.html %}
 
       <ul class="bs-masthead-links">
@@ -29,9 +31,6 @@
         <li>
           <a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
         </li>
-        <li>
-          <a href="{{ page.base_url }}components/#glyphicons" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
-        </li>
         <li>
           <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a>
         </li>
-- 
cgit v1.2.3