Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Commit546529a

Browse files
committed
Merge github/master from upstream
2 parents3ed874d +0037bbf commit546529a

13 files changed

+431
-114
lines changed

‎content/v3/orgs/teams.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ owner of the org that the team is associated with. Also, the repo must
193193
be owned by the organization, or a direct fork of a repo owned by the
194194
organization.
195195

196-
PUT /teams/:id/repos/:owner/:repo
196+
PUT /teams/:id/repos/:org/:repo
197197

198198
###Response
199199

‎content/v3/pulls.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ state
4141
:_Optional_**string** -`open` or`closed` to filter by state. Default
4242
is`open`.
4343

44+
head
45+
:_Optional_**string** - Filter pulls by head user and branch name in the format
46+
of:`user:ref-name`. Example:`github:new-script-format`.
47+
48+
base
49+
:_Optional_**string** - Filter pulls by base branch name. Example:
50+
`gh-pages`.
51+
4452
###Response
4553

4654
<%= headers 200 %>

‎content/v3/repos/contents.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ title: Repo Contents | GitHub API
88
{:toc}
99

1010
These API methods let you retrieve the contents of files within a repository as
11-
Base64 encoded content. See[media types](/v3/media/) for requesting rawor other formats.
11+
Base64 encoded content. See[media types](#custom-media-types) for requesting rawformat.
1212

1313
##Get the README
1414

1515
This method returns the preferred README for a repository.
1616

1717
GET /repos/:owner/:repo/readme
1818

19+
READMEs support[a custom media type](#custom-media-types) for getting the raw content.
20+
1921
###Parameters
2022

2123
ref
@@ -32,6 +34,9 @@ This method returns the contents of any file or directory in a repository.
3234

3335
GET /repos/:owner/:repo/contents/:path
3436

37+
Files and symlinks support[a custom media type](#custom-media-types) for getting the raw content.
38+
Directories do_not_ support custom media types.
39+
3540
*Note*: To get a repository's contents recursively, you can[recursively get
3641
the tree](/v3/git/trees/).
3742

@@ -94,3 +99,11 @@ curl -L https://api.github.com/repos/pengwynn/octokit/tarball > octokit.tar.gz
9499
Dload Upload Total Spent Left Speed
95100
100 206k 100 206k 0 0 146k 0 0:00:01 0:00:01 --:--:-- 790k
96101
</pre>
102+
103+
##Custom media types
104+
105+
[READMEs](#get-the-readme),[files](#get-contents), and[symlinks](#get-contents) support the following custom media type.
106+
107+
application/vnd.github.VERSION.raw
108+
109+
You can read more about the use of media types in the API[here](/v3/media/).

‎layouts/default.html

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<divid="header-wrapper">
2020
<divid="header">
2121
<div>
22-
<aclass="logo"href="/"><imgsrc="/images/logo_developer.png"width="255"height="45"alt="GitHub:Developer"/></a>
22+
<aclass="logo"href="/"><imgsrc="/images/logo_developer.png"height="45"alt="GitHub:Developer"/></a>
2323
<ulclass="nav">
2424
<liclass="api-status"></li>
2525
<li><ahref="/v3/">API v3</a></li>
@@ -155,9 +155,6 @@ <h3><a href="#" class="js-expand-btn collapsed">&nbsp;</a><a href="/v3/search/">
155155
<divclass="upper_footer">
156156
<divclass="footer_inner clearfix">
157157

158-
<!--[if IE]><h4 id="blacktocat_ie">GitHub Links</h4><![endif]-->
159-
<![if !IE]><h4id="blacktocat">GitHub Links</h4><![endif]>
160-
161158
<ulclass="footer_nav">
162159
<h4>GitHub</h4>
163160
<li><ahref="https://github.com/about">About</a></li>
@@ -195,21 +192,19 @@ <h4>Documentation</h4>
195192
</div><!-- /.upper_footer -->
196193

197194
<divclass="lower_footer">
198-
<divclass="footer_inner clearfix">
199-
<divid="legal">
200-
<!--[if IE]><a class="home_ie" href="http://github.com">Home</a><![endif]-->
201-
<![if !IE]><aclass="home"href="http://github.com">Home</a><![endif]>
195+
<ulclass="footer-cell">
196+
<li><ahref="http://help.github.com/terms-of-service/">Terms of Service</a></li>
197+
<li><ahref="http://help.github.com/privacy-policy/">Privacy</a></li>
198+
<li><ahref="http://help.github.com/security/">Security</a></li>
199+
</ul>
202200

203-
<ulid="legal_links">
204-
<li><ahref="http://help.github.com/terms-of-service/">Terms of Service</a></li>
205-
<li><ahref="http://help.github.com/privacy-policy/">Privacy</a></li>
206-
<li><ahref="http://help.github.com/security/">Security</a></li>
207-
</ul>
201+
<spanclass="footer-cell">
202+
<ahref="https://github.com"class="mega-icon mega-icon-invertocat"></a>
203+
</span>
204+
205+
<spanclass="footer-cell">&copy;<spanclass="js-year">2013</span> GitHub, Inc. All rights reserved.</span>
206+
</div>
208207

209-
<p>&copy;<spanid="year">year</span> GitHub Inc. All rights reserved.</p>
210-
</div><!-- /#legal or /#legal_ie-->
211-
</div><!-- /.site -->
212-
</div><!-- /.lower_footer -->
213208
</div><!-- /#footer -->
214209
<scripttype="text/javascript">
215210
var_gauges=_gauges||[];

‎lib/resources.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,11 +1012,11 @@ def text_html(response, status, head = {})
10121012
"sha"=>"452a98979c88e093d682cab404a3ec82babebb48",
10131013
"url"=>"https://api.github.com/repos/pengwynn/octokit/contents/bin/some-symlink",
10141014
"git_url"=>"https://api.github.com/repos/pengwynn/octokit/git/blobs/452a98979c88e093d682cab404a3ec82babebb48",
1015-
"html_url"=>"http://github.dev/pengwynn/octokit/blob/master/bin/some-symlink",
1015+
"html_url"=>"https://github.com/pengwynn/octokit/blob/master/bin/some-symlink",
10161016
"_links"=>{
10171017
"git"=>"https://api.github.com/repos/pengwynn/octokit/git/blobs/452a98979c88e093d682cab404a3ec82babebb48",
10181018
"self"=>"https://api.github.com/repos/pengwynn/octokit/contents/bin/some-symlink",
1019-
"html"=>"http://github.dev/pengwynn/octokit/blob/master/bin/some-symlink"
1019+
"html"=>"https://github.com/pengwynn/octokit/blob/master/bin/some-symlink"
10201020
},
10211021
}
10221022

‎static/favicon.ico

960 Bytes
Binary file not shown.

‎static/images/logo.png

-1.65 KB
Binary file not shown.

‎static/images/logo_developer.png

7.55 KB
Loading

‎static/shared/css/documentation.css

Lines changed: 62 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
@font-face {
2+
font-family:'octiconsregular';
3+
src:url('octicons-regular-webfont.eot');
4+
src:url('octicons-regular-webfont.eot?#iefix')format('embedded-opentype'),
5+
url('octicons-regular-webfont.woff')format('woff'),
6+
url('octicons-regular-webfont.svg#octiconsregular')format('svg');
7+
font-weight: normal;
8+
font-style: normal;
9+
}
10+
11+
/*------------------------------------------------------------------------------
12+
Icon Styles
13+
------------------------------------------------------------------------------*/
14+
15+
.mega-icon {
16+
font-family:'octiconsregular';
17+
font-weight: normal;
18+
font-style: normal;
19+
display: inline-block;
20+
text-decoration: none;
21+
line-height:1;
22+
-webkit-font-smoothing: antialiased;
23+
font-size:24px;
24+
width:24px;
25+
height:24px;
26+
}
27+
28+
.mega-icon-invertocat:before {
29+
content:"\f00a";
30+
}
31+
32+
/* end */
33+
134
/*------------------------------------------------------------------------------
235
Global Documentation Styles
336
------------------------------------------------------------------------------*/
@@ -332,7 +365,8 @@ div.sidebar-module ul ul li span {
332365
bottom:0;
333366
font-size:13px;
334367
color:#636363;
335-
margin:45px000;
368+
margin:0 auto;
369+
width:920px;
336370
}
337371

338372
#footera:hover {
@@ -343,121 +377,56 @@ div.sidebar-module ul ul li span {
343377
list-style: none;
344378
}
345379

346-
.footer_inner {
347-
width:960px;
348-
position: relative;
349-
margin:0 auto;
350-
}
351-
352380
#footer .upper_footer {
381+
border-top:1px solid#ddd;
353382
min-height:160px;
354383
overflow: hidden;
355-
background: url(../images/bg_footer_top.png)#f8f8f8 repeat-x;
356-
}
357-
358-
#footer#blacktocat {
359-
height:130px;
360-
width:164px;
361-
float:left;
362-
background: url(../images/blacktocat.png)top left no-repeat;
363-
text-indent:-5000px;
364-
margin:15px20px00;
365-
}
366-
367-
#footer#blacktocat_ie {
368-
height:130px;
369-
width:164px;
370-
float:left;
371-
background: url(../images/blacktocat.png) no-repeat;
372-
text-indent:-5000px;
373-
margin:15px20px00;
384+
font-size:12px;
374385
}
375386

376387
#footer .upper_footerul.footer_nav {
377388
position: relative;
378389
float: left;
379-
width:164px;
390+
width:210px;
380391
margin:20px10px;
381392
}
382393

383-
#footer .upper_footerul.footer_navh4 {
384-
margin:005px0;
385-
padding-bottom:5px;
386-
border-bottom: thin solid#e1e1e1;
387-
}
388-
389-
#footer .lower_footer {
390-
position: relative;
391-
background:url(../images/bg_footer_bottom.png)#fff repeat-x;
392-
overflow: hidden;
393-
clear:both;
394-
}
395-
396-
#footer .lower_footer .home {
397-
display: block;
398-
position: absolute;
399-
background: url(../images/footer-logo.png)top left no-repeat;
400-
width:100px;
401-
height:50px;
402-
text-indent:-5000px;
403-
}
404-
405-
#footer .lower_footer .home_ie {
406-
display: block;
407-
position: absolute;
408-
background: url(../images/footer-logo.png)top left no-repeat;
409-
width:100px;
410-
height:50px;
411-
text-indent:-5000px;
412-
}
413-
414-
#footer .lower_footer#legal {
415-
float: left;
416-
width:500px;
417-
height:50px;
418-
line-height:8px;
419-
margin:25px0017px;
394+
#footer .mega-icon {
395+
color:#ccc;
420396
}
421397

422-
#footer .lower_footer#legal#legal_links {
423-
margin-left:177px;
424-
}
425-
426-
#footer .lower_footerdivul {
427-
float: left;
428-
text-indent: none;
429-
display:inline;
430-
margin-top:15px;
431-
398+
#footer .mega-icon:hover {
399+
color:#bbb;
400+
text-decoration: none;
432401
}
433402

434-
#footer .lower_footerdivulli {
435-
display:inline;
436-
float: left;
437-
margin:010px00;
403+
.lower_footer {
404+
border-top:1px solid#ddd;
405+
display: table;
406+
width:100%;
407+
padding:15px020px;
438408
}
439409

440-
#footer .lower_footerdivp {
441-
display:inline;
442-
float:left;
443-
clear: both;
444-
margin:10px00177px;
410+
.footer-cell {
411+
display: table-cell;
412+
text-align: center;
413+
width:10%;
414+
vertical-align: middle;
415+
font-size:12px;
416+
padding:010px;
445417
}
446418

447-
#footer .lower_footer .sponsor {
448-
width:295px;
449-
float: right;
450-
margin-top:35px;
451-
padding-bottom:25px;
419+
.footer-cell:first-child {
420+
text-align: left;
452421
}
453422

454-
#footer .lower_footer .sponsor .logo {
455-
float:left;
456-
margin:010px00;
423+
.footer-cell:last-child {
424+
text-align: right;
457425
}
458426

459-
#footer .lower_footer .sponsora {
460-
color:#000;
427+
.footer-cell>li {
428+
display: inline;
429+
margin-right:20px;
461430
}
462431

463432
/* end */
59.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp