diff options
| -rw-r--r-- | _layouts/default.html | 26 | ||||
| -rw-r--r-- | _posts/2008-01-04-be-social.markdown | 2 | ||||
| -rw-r--r-- | _posts/2008-01-08-send-pull-requests.md | 8 | ||||
| -rw-r--r-- | css/style.css | 94 | ||||
| -rw-r--r-- | index.markdown | 4 | ||||
| -rw-r--r-- | shared/css/documentation.css | 195 | ||||
| -rw-r--r-- | shared/images/footer_logo.png | bin | 0 -> 4430 bytes |
7 files changed, 178 insertions, 151 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>© 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®</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/_posts/2008-01-04-be-social.markdown b/_posts/2008-01-04-be-social.markdown index 47a7c62..8e3ec81 100644 --- a/_posts/2008-01-04-be-social.markdown +++ b/_posts/2008-01-04-be-social.markdown @@ -37,7 +37,7 @@ One of the great features on GitHub is the ability to see what other people are </a> </div> - Who are these fine fellows? Why the founders of GitHub, of course! + Who are these fine fellows? We're the founders of GitHub, of course! 2. <span class="step-title">Follow a friend</span> diff --git a/_posts/2008-01-08-send-pull-requests.md b/_posts/2008-01-08-send-pull-requests.md index 464ca1b..d45bbf0 100644 --- a/_posts/2008-01-08-send-pull-requests.md +++ b/_posts/2008-01-08-send-pull-requests.md @@ -186,7 +186,7 @@ preformatted text blocks, and other formatting supported by Markdown. Once the pull request is deemed satisfactory, someone with push access to the destination repository must apply the changes and push the updated branch. -There are a variety of ways to accomplish this. Two popular methods are +There are a variety of ways to accomplish this. Three popular methods are described below. #### Fetch and Merge @@ -219,6 +219,12 @@ to feed into the `git-am` command: <span>$</span> git push origin master </pre> +#### Auto Merge + +In many cases it is possible to ask github to auto merge a pull request using +the merge button. This was made possible with the launch of Pull Requests 2.0 +and is covered in the [related blog post](https://github.com/blog/843-the-merge-button). + ## Closing a Pull Request Pull Requests are automatically closed when the requested commits are merged diff --git a/css/style.css b/css/style.css index b86cb2d..7db0eb6 100644 --- a/css/style.css +++ b/css/style.css @@ -362,97 +362,3 @@ img.top-margin { /* @end */ -/****************************/ -/* Popular Guides */ -/****************************/ - -.popular-guides h2 { - border: solid #cacaca; - border-width: 1px; - border-radius: 3px 3px 0px 0px; - -moz-border-radius: 3px 3px 0px 0px; - -webkit-border-bottom-right-radius: 0px; - -webkit-border-bottom-left-radius: 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - padding: 6px 10px; - background-color: #f1f1f1; - background-image: -moz-linear-gradient(top, #f1f1f1, #e1e1e1); - background-image: -ms-linear-gradient(top, #f1f1f1, #e1e1e1); - background-image: -o-linear-gradient(top, #f1f1f1, #e1e1e1); - background-image: -webkit-gradient(linear, left top, left bottom, from(#f1f1f1), to(#e1e1e1)); - background-image: -webkit-linear-gradient(top, #f1f1f1, #e1e1e1); - background-image: linear-gradient(top, #f1f1f1, #e1e1e1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f1f1f1', EndColorStr='#e1e1e1'); - color: #666; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7); - font-size: 16px; - line-height: 22px; - margin: 0px; -} - -.popular-guides .popular-body { - border: solid #cacaca; - border-width: 0px 1px 1px 1px; - border-radius: 0px 0px 3px 3px; - -moz-border-radius: 0px 0px 3px 3px; - -webkit-border-bottom-right-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - background-color: #fafafb; - color: #666; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7); -} - -.popular-guides .popular-body .icon { - display: block; - height: 28px; - width: 28px; - position: absolute; - top: 10px; - left: 10px; - background: transparent url(images/popular_guide_sprites.png) 0 0 no-repeat; -} - -.popular-guides a { - border-top: 1px solid #fff; - border-bottom: 1px solid #e9ecee; - padding: 6px 10px; - position: relative; - display: block; -} - -.popular-guides a:hover { - border-top: 1px solid #fafafb; - border-bottom: 1px solid #e5e8ea; - background-color: #f0f0f3; - text-decoration: none; -} - -.popular-guides a h3 { - color: #4183C4; -} - -.popular-guides a:hover h3 { - text-decoration: underline; -} - -.popular-guides ul { - list-style-type: none; - margin: 0px; -} - -.popular-guides h3 { - margin: 0px; - font-size: 13px; -} - -.popular-guides .popular-body a p { - color: #666; - margin: 0px; -} - -/* @end */ diff --git a/index.markdown b/index.markdown index 973f092..1e82500 100644 --- a/index.markdown +++ b/index.markdown @@ -44,9 +44,9 @@ title: Welcome </div> <!-- /bootcamp-body --> </div> -<div class="popular-guides"> +<div class="list-module"> <h2>Popular Guides</h2> - <div class="popular-body"> + <div class="list-body"> <ul> {% for post in site.categories.popular reversed %} <li> diff --git a/shared/css/documentation.css b/shared/css/documentation.css index 9f46f17..a5a7f78 100644 --- a/shared/css/documentation.css +++ b/shared/css/documentation.css @@ -2,6 +2,10 @@ Global Documentation Styles ------------------------------------------------------------------------------*/ +html { + height:100%; +} + body { font: 13px helvetica,arial,freesans,clean,sans-serif; line-height: 1.4em; @@ -303,7 +307,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 +318,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; } - -#bottom-nav { - padding-top: 0.7em; - position: relative; - float: left; - display: block; +#footer h2.logo a { + float:left; + width:120px; + height:53px; + text-indent:-9999px; + text-decoration:none; } - -#footer .nav, -#footer .nav li { +#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; +} +#footer ul.github-nav li:first-child { + padding-left:0; + border-left:none; +} +#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 */ @@ -668,4 +694,99 @@ span.bash-output { .more-info .more-content pre { margin-left: 0px; -}
\ No newline at end of file +} + +/****************************/ +/* List Module */ +/****************************/ + +.list-module h2 { + border: solid #cacaca; + border-width: 1px; + border-radius: 3px 3px 0px 0px; + -moz-border-radius: 3px 3px 0px 0px; + -webkit-border-bottom-right-radius: 0px; + -webkit-border-bottom-left-radius: 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + padding: 6px 10px; + background-color: #f1f1f1; + background-image: -moz-linear-gradient(top, #f1f1f1, #e1e1e1); + background-image: -ms-linear-gradient(top, #f1f1f1, #e1e1e1); + background-image: -o-linear-gradient(top, #f1f1f1, #e1e1e1); + background-image: -webkit-gradient(linear, left top, left bottom, from(#f1f1f1), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #f1f1f1, #e1e1e1); + background-image: linear-gradient(top, #f1f1f1, #e1e1e1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f1f1f1', EndColorStr='#e1e1e1'); + color: #666; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7); + font-size: 16px; + line-height: 22px; + margin: 0px; +} + +.list-module .list-body { + border: solid #cacaca; + border-width: 0px 1px 1px 1px; + border-radius: 0px 0px 3px 3px; + -moz-border-radius: 0px 0px 3px 3px; + -webkit-border-bottom-right-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + background-color: #fafafb; + color: #666; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7); +} + +.list-module .list-body .icon { + display: block; + height: 28px; + width: 28px; + position: absolute; + top: 10px; + left: 10px; + background: transparent url(images/popular_guide_sprites.png) 0 0 no-repeat; +} + +.list-module a { + border-top: 1px solid #fff; + border-bottom: 1px solid #e9ecee; + padding: 6px 10px; + position: relative; + display: block; +} + +.list-module a:hover { + border-top: 1px solid #fafafb; + border-bottom: 1px solid #e5e8ea; + background-color: #f0f0f3; + text-decoration: none; +} + +.list-module a h3 { + color: #4183C4; +} + +.list-module a:hover h3 { + text-decoration: underline; +} + +.list-module ul { + list-style-type: none; + margin: 0px; +} + +.list-module h3 { + margin: 0px; + font-size: 13px; +} + +.list-module .list-body a p { + color: #666; + margin: 0px; +} + +/* @end */ diff --git a/shared/images/footer_logo.png b/shared/images/footer_logo.png Binary files differnew file mode 100644 index 0000000..8ad67d3 --- /dev/null +++ b/shared/images/footer_logo.png |
