Skip to content

Commit c797c6c

Browse files
schaconschacon
committed
Merge remote branch 'origin/next' into gitdb
2 parents 3c62186 + 94c27f1 commit c797c6c

30 files changed

+1745
-138
lines changed

‎Rakefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
require 'nanoc3/tasks'
1+
require 'nanoc3/tasks'
2+
3+
desc "compile and copy output to ../developer.github.pages"
4+
task :publish => [:clean] do
5+
sh "nanoc compile"
6+
sh "cp -r output/ ../developer.github.pages"
7+
end

‎Rules‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ end
2727
compile '/shared/js/*' do
2828
end
2929

30+
compile '/assets/*' do
31+
end
32+
3033
compile '*' do
3134
filter :erb
3235
filter :kramdown
@@ -55,6 +58,10 @@ route '/shared/js/*/' do
5558
item.identifier.chomp('/') << '.js'
5659
end
5760

61+
route '/assets/favicon/' do
62+
'/favicon.ico'
63+
end
64+
5865
route '*' do
5966
item.identifier + 'index.html'
6067
end

‎content/assets/favicon.ico‎

1.12 KB
Binary file not shown.

‎content/index.md‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,41 @@ title: developer.github.com
44

55
# developer.github.com
66

7-
This describes the Resources that make up the official GitHub API v3.
8-
You can look at the [API v2](http://develop.github.com/) to access
9-
resources that have not yet been added to v3.
7+
This describes the Resources that make up the official GitHub API v3. If
8+
you have any problems or requests please contact
9+
[support](mailto:support@github.com?subject=APIv3).
1010

1111
For the new API v3, start browsing the implemented resources on the
1212
right >>
1313

14-
Visit [GitHub API
15-
Support](http://support.github.com/discussions/api) if you
16-
have any problems or requests.
17-
1814
## Breaking BETA Changes
1915

2016
We're making some small tweaks to the API during the BETA phase. Old
2117
behavior will be supported until the dates listed below. Please be sure
2218
to update your app in time.
2319

24-
### Behavior due to be remove by June 1st:
20+
### Behavior due to be removed by July 20th:
2521

26-
* Update requests used to accept the PUT verb. Now POST or PATCH should
27-
be used.
28-
* All URLs had a `.json` extension. They don't anymore (but old
29-
requests work still).
30-
* Pagination info is returned in the Link header. Stop using the X-Next
31-
or X-Last headers.
32-
* JSON-P response has completely changed to a more consistent format.
33-
* Starring gists now uses PUT verb (instead of POST) and returns 204.
22+
* `integrate_branch` on the [repo API](/v3/repos/#get) will no longer be
23+
returned.
24+
25+
### Changelog for breaking changes
3426

35-
### Behavior due to be removed by June 15th:
27+
#### Removed on June 15th:
3628

37-
* gravatar_url is being deprecated in favor of avatar_url for all
29+
* `gravatar_url` is being deprecated in favor of `avatar_url` for all
3830
responses that include users or orgs. A default size is no longer
3931
included in the url.
40-
* creating new gists (both anonymously and with an authenticated user)
41-
should use `POST /gists` from now on. `POST /users/:user/gists` will
42-
be deprecated.
32+
* Creating new gists (both anonymously and with an authenticated user)
33+
should use `POST /gists` from now on. `POST /users/:user/gists` is no
34+
longer supported.
4335

36+
#### Removed on June 1st:
37+
38+
* Removed support for PUT verb on update requests. Use POST or PATCH
39+
instead.
40+
* Removed `.json` extension from all URLs.
41+
* No longer using the X-Next or X-Last headers. Pagination info is
42+
returned in the Link header instead.
43+
* JSON-P response has completely changed to a more consistent format.
44+
* Starring gists now uses PUT verb (instead of POST) and returns 204.

‎content/shared/css/documentation.css‎

Lines changed: 158 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Global Documentation Styles
33
------------------------------------------------------------------------------*/
44

5+
html {
6+
height:100%;
7+
}
8+
59
body {
610
font: 13px helvetica,arial,freesans,clean,sans-serif;
711
line-height: 1.4em;
@@ -303,7 +307,7 @@ div.sidebar-module ul ul li span {
303307
#footer-wrapper {
304308
border-top: solid 1px #ddd;
305309
background-color: #222;
306-
padding: 1em 0;
310+
padding: 2em 0;
307311
color: #eee;
308312
margin-top: -88px;
309313
}
@@ -314,56 +318,78 @@ div.sidebar-module ul ul li span {
314318
overflow: hidden;
315319
margin: 0 auto;
316320
width: 920px;
317-
321+
position: relative;
318322
}
319323

320-
#footer p {
321-
margin: 0;
324+
#footer a {
325+
color:#fff;
326+
text-decoration:none;
322327
}
323-
324-
#footer .rackspace {
325-
line-height: 1.5em;
326-
padding: 1.1em 1em 1em 65px;
327-
color: #666;
328-
background: url(/shared/images/rackspace_logo.png) 1.2em 50% no-repeat #f1f1f1;
329-
-webkit-border-radius: 5px;
330-
-moz-border-radius: 5px;
328+
#footer a:hover {
329+
text-decoration:underline;
331330
}
332-
333-
.rackspace a,
334-
.rackspace a:active,
335-
.rackspace a:hover {
336-
color: #333;
331+
#footer h2.logo {
332+
margin:0 20px 0 0;
333+
float:left;
334+
}
335+
#footer h2.logo a {
336+
float:left;
337+
width:120px;
338+
height:53px;
339+
text-indent:-9999px;
340+
text-decoration:none;
341+
}
342+
#footer ul.github-nav {
343+
display:inline-block;
344+
margin:14px 0 0 0;
345+
padding-bottom:5px;
346+
font-size:14px;
347+
border-bottom:2px solid #303030;
348+
}
349+
#footer ul.github-nav li {
350+
list-style-type:none;
351+
float:left;
352+
margin:0;
353+
padding:0 5px;
354+
line-height:1;
355+
border-left:1px solid #666;
337356
}
338-
339-
#bottom-nav {
340-
padding-top: 0.7em;
341-
position: relative;
342-
float: left;
343-
display: block;
357+
#footer ul.github-nav li:first-child {
358+
padding-left:0;
359+
border-left:none;
344360
}
345-
346-
#footer .nav,
347-
#footer .nav li {
361+
#footer p.copyline {
362+
margin:3px 0 0 0;
363+
font-size:14px;
364+
}
365+
#footer p.rackspace {
348366
margin:0;
367+
width:230px;
368+
padding:10px 10px 10px 56px;
369+
font-size:12px;
370+
color:#666;
371+
background:url(/shared/images/rackspace_logo.png) 10px 50% no-repeat #f1f1f1;
372+
-webkit-border-radius:5px;
373+
-moz-border-radius:5px;
374+
}
375+
#footer p.rackspace a {
376+
text-decoration:underline;
377+
color:#333;
349378
}
350379

351-
#footer .nav li {
352-
display: inline;
353-
line-height: 2em;
354-
padding-right: 3px;
380+
#footer h2.logo a {
381+
background:url(/shared/images/footer_logo.png) no-repeat;
355382
}
356383

357-
#footer .nav li + li {
358-
border-left: 2px solid #666;
359-
padding-left: 5px;
384+
#footer div.left-col {
385+
position: relative;
386+
float: left;
360387
}
361388

362-
#bottom-notice {
363-
width: 310px;
364-
display: block;
389+
#footer div.right-col {
365390
position: relative;
366391
float: right;
392+
line-height: 1.4em;
367393
}
368394

369395
/* end */
@@ -668,4 +694,99 @@ span.bash-output {
668694

669695
.more-info .more-content pre {
670696
margin-left: 0px;
671-
}
697+
}
698+
699+
/****************************/
700+
/* List Module */
701+
/****************************/
702+
703+
.list-module h2 {
704+
border: solid #cacaca;
705+
border-width: 1px;
706+
border-radius: 3px 3px 0px 0px;
707+
-moz-border-radius: 3px 3px 0px 0px;
708+
-webkit-border-bottom-right-radius: 0px;
709+
-webkit-border-bottom-left-radius: 0px;
710+
-moz-background-clip: padding;
711+
-webkit-background-clip: padding-box;
712+
background-clip: padding-box;
713+
padding: 6px 10px;
714+
background-color: #f1f1f1;
715+
background-image: -moz-linear-gradient(top, #f1f1f1, #e1e1e1);
716+
background-image: -ms-linear-gradient(top, #f1f1f1, #e1e1e1);
717+
background-image: -o-linear-gradient(top, #f1f1f1, #e1e1e1);
718+
background-image: -webkit-gradient(linear, left top, left bottom, from(#f1f1f1), to(#e1e1e1));
719+
background-image: -webkit-linear-gradient(top, #f1f1f1, #e1e1e1);
720+
background-image: linear-gradient(top, #f1f1f1, #e1e1e1);
721+
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f1f1f1', EndColorStr='#e1e1e1');
722+
color: #666;
723+
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7);
724+
font-size: 16px;
725+
line-height: 22px;
726+
margin: 0px;
727+
}
728+
729+
.list-module .list-body {
730+
border: solid #cacaca;
731+
border-width: 0px 1px 1px 1px;
732+
border-radius: 0px 0px 3px 3px;
733+
-moz-border-radius: 0px 0px 3px 3px;
734+
-webkit-border-bottom-right-radius: 3px;
735+
-webkit-border-bottom-left-radius: 3px;
736+
-moz-background-clip: padding;
737+
-webkit-background-clip: padding-box;
738+
background-clip: padding-box;
739+
background-color: #fafafb;
740+
color: #666;
741+
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7);
742+
}
743+
744+
.list-module .list-body .icon {
745+
display: block;
746+
height: 28px;
747+
width: 28px;
748+
position: absolute;
749+
top: 10px;
750+
left: 10px;
751+
background: transparent url(images/popular_guide_sprites.png) 0 0 no-repeat;
752+
}
753+
754+
.list-module a {
755+
border-top: 1px solid #fff;
756+
border-bottom: 1px solid #e9ecee;
757+
padding: 6px 10px;
758+
position: relative;
759+
display: block;
760+
}
761+
762+
.list-module a:hover {
763+
border-top: 1px solid #fafafb;
764+
border-bottom: 1px solid #e5e8ea;
765+
background-color: #f0f0f3;
766+
text-decoration: none;
767+
}
768+
769+
.list-module a h3 {
770+
color: #4183C4;
771+
}
772+
773+
.list-module a:hover h3 {
774+
text-decoration: underline;
775+
}
776+
777+
.list-module ul {
778+
list-style-type: none;
779+
margin: 0px;
780+
}
781+
782+
.list-module h3 {
783+
margin: 0px;
784+
font-size: 13px;
785+
}
786+
787+
.list-module .list-body a p {
788+
color: #666;
789+
margin: 0px;
790+
}
791+
792+
/* @end */

‎content/shared/images/footer_logo.png‎

4.33 KB
Loading

‎content/v3.md‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ title: Issues API v3 | developer.github.com
44

55
# API v3
66

7-
This describes the Resources that make up the official GitHub API v3.
8-
You can look at the [API v2](http://develop.github.com/) to access
9-
resources that have not yet been added to v3.
7+
This describes the Resources that make up the official GitHub API v3. If
8+
you have any problems or requests please contact
9+
[support](mailto:support@github.com?subject=APIv3).
1010

11-
Visit [GitHub API
12-
Support](http://support.github.com/discussions/api) if you
13-
have any problems or requests.
14-
15-
**Note:** This API is in a beta state. Breaking changes may occur.
11+
**Note:** This API is in a beta state. Breaking changes may occur.
1612

1713
* <a href="#schema">Schema</a>
1814
* <a href="#client-errors">Client Errors</a>

0 commit comments

Comments
 (0)