summaryrefslogtreecommitdiff
path: root/_layouts/default.html
diff options
context:
space:
mode:
authorCameron McEfee <cameron@github.com>2011-06-01 11:26:48 -0700
committerCameron McEfee <cameron@github.com>2011-06-01 11:26:48 -0700
commit739339356b9c6dac01f3e00d7857fe439330920b (patch)
tree76973ac2623768f7b8aa8d372d6106dc63e3c93a /_layouts/default.html
parent75e24fdca4e70e751332c491a4b60a712e12c9e0 (diff)
parent07b13a34b4af4d58e646712123ecc4aceae2c7a4 (diff)
Merge branch 'gh-pages' into reorder-nav
Diffstat (limited to '_layouts/default.html')
-rw-r--r--_layouts/default.html26
1 files changed, 10 insertions, 16 deletions
diff --git a/_layouts/default.html b/_layouts/default.html
index 70a6455..f383ccb 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -74,25 +74,19 @@ sidebar_cats:
</div><!-- /not-footer -->
<div id="footer-wrapper">
- <div id="footer" class="container_12">
- <div id="bottom-nav">
- <ul class="nav">
- <li><a href="https://github.com/blog">Blog</a></li>
+ <div id="footer">
+ <div class="left-col">
+ <h2 class="logo"><a href="http://github.com">Brought to you by GitHub</a></h2>
+ <ul class="github-nav">
+ <li><a href="http://github.com/blog" class="blog">The GitHub Blog</a></li>
<li><a href="http://support.github.com">Support</a></li>
- <li><a href="https://github.com/contact">Contact</a></li>
- <li><a href="https://twitter.com/github">Twitter</a></li>
- <li><a href="http://help.github.com/security/">Security</a></li>
- <li><a href="http://github.com/github/help.github.com#readme">Source</a></li>
- </ul>
- <ul class="nav">
- <li>&copy; 2011 GitHub Inc. All rights
- reserved.</li>
- <li><a href="http://help.github.com/terms/">Terms of Service</a></li>
- <li><a href="http://help.github.com/privacy/">Privacy Policy</a></li>
+ <li><a href="http://github.com/contact">Contact</a></li>
+ <li><a href="http://developer.github.com">API</a></li>
</ul>
+ <p class="copyline">© 2011 GitHub Inc. All rights reserved</p>
</div>
- <div id="bottom-notice">
- <p class="rackspace">Powered by the <a href="http://rackspace.com" target="_blank">Dedicated Servers</a> and <a href="http://rackspacecloud.com" target="_blank">Cloud Computing</a> of Rackspace Hosting&reg;</p>
+ <div class="right-col">
+ <p class="rackspace">Powered by the <a href="http://rackspace.com" target="_blank">Dedicated Servers</a> and <a href="http://rackspacecloud.com" target="_blank">Cloud Computing</a> of Rackspace Hosting®</p>
</div>
</div><!-- #footer -->
</div><!-- #footer-wrapper -->