From 398c9cd6199c4873ca318af9f3f50ff4f62a1558 Mon Sep 17 00:00:00 2001
From: Cameron McEfee <cameron@github.com>
Date: Fri, 27 May 2011 12:31:55 -0700
Subject: Update global styles to 58b228705822e1ce832e2b6b4f415cb8649bb96e

---
 _layouts/default.html         |  26 +++++-------
 shared/css/documentation.css  |  94 ++++++++++++++++++++++++++----------------
 shared/images/footer_logo.png | Bin 0 -> 4430 bytes
 3 files changed, 68 insertions(+), 52 deletions(-)
 create mode 100644 shared/images/footer_logo.png

diff --git a/_layouts/default.html b/_layouts/default.html
index 67a0c67..9dc7906 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -77,25 +77,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="/api">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 -->
diff --git a/shared/css/documentation.css b/shared/css/documentation.css
index 9f46f17..2b8cf50 100644
--- a/shared/css/documentation.css
+++ b/shared/css/documentation.css
@@ -303,7 +303,7 @@ div.sidebar-module ul ul li span {
 #footer-wrapper {
   border-top: solid 1px #ddd;
   background-color: #222;
-  padding: 1em 0;
+  padding: 2em 0;
   color: #eee;
   margin-top: -88px;
 }
@@ -314,56 +314,78 @@ div.sidebar-module ul ul li span {
   overflow: hidden;
   margin: 0 auto;
   width: 920px;
-
+  position: relative;
 }
 
-#footer p {
-  margin: 0;
+#footer a {
+  color:#fff;
+  text-decoration:none;
 }
-
-#footer .rackspace {
-  line-height: 1.5em;
-  padding: 1.1em 1em 1em 65px;
-  color: #666;
-  background: url(/shared/images/rackspace_logo.png) 1.2em 50% no-repeat #f1f1f1;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
+#footer a:hover {
+  text-decoration:underline;
 }
-
-.rackspace a,
-.rackspace a:active,
-.rackspace a:hover {
-  color: #333;
+#footer h2.logo {
+  margin:0 20px 0 0;
+  float:left;
+}
+#footer h2.logo a {
+  float:left;
+  width:120px;
+  height:53px;
+  text-indent:-9999px;
+  text-decoration:none;
+}
+#footer ul.github-nav {
+  display:inline-block;
+  margin:14px 0 0 0;
+  padding-bottom:5px;
+  font-size:14px;
+  border-bottom:2px solid #303030;
+}
+#footer ul.github-nav li {
+  list-style-type:none;
+  float:left;
+  margin:0;
+  padding:0 5px;
+  line-height:1;
+  border-left:1px solid #666;
 }
-
-#bottom-nav {
-  padding-top: 0.7em;
-  position: relative;
-  float: left;
-  display: block;
+#footer ul.github-nav li:first-child {
+  padding-left:0;
+  border-left:none;
 }
-
-#footer .nav,
-#footer .nav li {
+#footer p.copyline {
+  margin:3px 0 0 0;
+  font-size:14px;
+}
+#footer p.rackspace {
   margin:0;
+  width:230px;
+  padding:10px 10px 10px 56px;
+  font-size:12px;
+  color:#666;
+  background:url(/shared/images/rackspace_logo.png) 10px 50% no-repeat #f1f1f1;
+  -webkit-border-radius:5px;
+  -moz-border-radius:5px;
+}
+#footer p.rackspace a {
+  text-decoration:underline;
+  color:#333;
 }
 
-#footer .nav li {
-  display: inline;
-  line-height: 2em;
-  padding-right: 3px;
+#footer h2.logo a {
+  background:url(/shared/images/footer_logo.png) no-repeat;
 }
 
-#footer .nav li + li {
-  border-left: 2px solid #666;
-  padding-left: 5px;
+#footer div.left-col {
+  position: relative;
+  float: left;
 }
 
-#bottom-notice {
-  width: 310px;
-  display: block;
+#footer div.right-col {
   position: relative;
   float: right;
+  line-height: 1.4em;
 }
 
 /* end */
diff --git a/shared/images/footer_logo.png b/shared/images/footer_logo.png
new file mode 100644
index 0000000..8ad67d3
Binary files /dev/null and b/shared/images/footer_logo.png differ
-- 
cgit v1.3.1