Skip to content

Commit be1f0ef

Browse files
NosfericanNosferican
authored
Merge branch 'source' into R-and-Julia
2 parents f28f6df + 3e080fc commit be1f0ef

26 files changed

+687
-805
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ node_modules
66
npm-debug.log
77

88
/build/
9-
.tmp.*
9+
.tmp.*
10+
package-lock.json

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"babel-loader": "^5.3.2",
2525
"babel-runtime": "^5.8.20",
2626
"express": "^4.13.3",
27-
"js-yaml": "^3.4.0",
27+
"js-yaml": "^3.13.1",
2828
"less": "^2.7.1",
2929
"react": "15.3.1",
3030
"react-dom": "15.3.1",

‎site/_core/HeaderLinks.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ const links = [
1212
{ section: 'learn', text: 'Learn', href: '/learn/' },
1313
{ section: 'code', text: 'Code', href: '/code/' },
1414
{ section: 'community', text: 'Community', href: '/community/' },
15-
{ section: 'spec', text: 'Spec', href: 'https://facebook.github.io/graphql/' },
15+
{ section: 'spec', text: 'Spec', href: 'https://graphql.github.io/graphql-spec/' },
1616
{ section: 'codeofconduct', text: 'Code of Conduct', href: '/codeofconduct/' },
1717
{ section: 'foundation', text: 'Foundation', href: 'https://foundation.graphql.org/' },
18+
{ section: 'landscape', text: 'Landscape', href: 'https://l.graphql.org/' },
1819
];
1920

2021
export default ({ section }) =>

‎site/_core/Redirect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
var React = require('react');
1010

1111
export default ({ to }) =>
12-
<html>
12+
<html lang="en">
1313
<head>
1414
<meta charset="UTF-8" />
1515
<meta http-equiv="refresh" content={'1;url=' + to} />

‎site/_core/Search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ var React = require('react');
1010

1111
export default () =>
1212
<div className="algolia-search-wrapper">
13-
<input id="algolia-search-input" type="text" placeholder="Search docs..." />
13+
<input id="algolia-search-input" type="text" placeholder="Search docs..." aria-label="Search docs" />
1414
</div>

‎site/_core/Site.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var Search = require('./Search');
1212
var SiteData = require('./SiteData');
1313

1414
export default ({ page, category, title, section, className, noSearch, children }) =>
15-
<html>
15+
<html lang="en">
1616
<head>
1717
<meta charSet="utf-8" />
1818
<meta httpEquiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@@ -22,6 +22,7 @@ export default ({ page, category, title, section, className, noSearch, children
2222
`GraphQL | ${SiteData.description}`}
2323
</title>
2424
<meta name="viewport" content="width=640" />
25+
<meta name="description" content="GraphQL provides a complete description of the data in your API, gives clients the power to ask for exactly what they need and nothing more, makes it easier to evolve APIs over time, and enables powerful developer tools." />
2526
<meta property="og:title" content="GraphQL: A query language for APIs." />
2627
<meta property="og:description" content="GraphQL provides a complete description of the data in your API, gives clients the power to ask for exactly what they need and nothing more, makes it easier to evolve APIs over time, and enables powerful developer tools." />
2728
<meta property="og:type" content="website" />
@@ -45,7 +46,7 @@ export default ({ page, category, title, section, className, noSearch, children
4546
<header>
4647
<section>
4748
<a className="nav-home" href="/">
48-
<img className="nav-logo" src="/img/logo.svg" width="30" height="30" />
49+
<img className="nav-logo" src="/img/logo.svg" alt="GraphQL Logo" width="30" height="30" />
4950
GraphQL
5051
</a>
5152
<HeaderLinks section={section} />
@@ -57,7 +58,7 @@ export default ({ page, category, title, section, className, noSearch, children
5758

5859
<footer>
5960
<section className="sitemap">
60-
<a href="/" className="nav-home" />
61+
<a href="/" className="nav-home" aria-label="Homepage" />
6162
<div>
6263
<h5><a href="/learn/">Learn</a></h5>
6364
<a href="/learn/">Introduction</a>
@@ -81,29 +82,28 @@ export default ({ page, category, title, section, className, noSearch, children
8182
</div>
8283
<div>
8384
<h5>More</h5>
84-
<a href="https://facebook.github.io/graphql/" target="_blank" rel="noopener noreferrer">GraphQL Specification</a>
85+
<a href="https://graphql.github.io/graphql-spec/" target="_blank" rel="noopener noreferrer">GraphQL Specification</a>
8586
<a href="https://foundation.graphql.org/" target="_blank" rel="noopener noreferrer">GraphQL Foundation</a>
8687
<a href="https://github.com/graphql" target="_blank" rel="noopener noreferrer">GraphQL GitHub</a>
8788
{page && <a href={'https://github.com/graphql/graphql.github.io/edit/source/site/' + page.relPath} target="_blank" rel="noopener noreferrer">Edit this page &#x270E;</a>}
8889
</div>
8990
</section>
90-
<a href="https://code.facebook.com/projects/" target="_blank" rel="noopener noreferrer" className="fbOpenSource">
91-
<img src="/img/oss_logo.png" alt="Facebook Open Source" width="170" height="45" />
92-
</a>
9391
<section className="copyright">
94-
The contents of this page are licensed BSD-3-Clause.
92+
Copyright © {`${new Date().getFullYear()}`} The GraphQL Foundation. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our <a href="https://www.linuxfoundation.org/trademark-usage">Trademark Usage</a> page. Linux is a registered trademark of Linus Torvalds. <a href="http://www.linuxfoundation.org/privacy">Privacy Policy</a> and <a href="http://www.linuxfoundation.org/terms">Terms of Use</a>.
9593
</section>
9694
</footer>
9795

9896
<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
99-
<script dangerouslySetInnerHTML={{__html: `
97+
<script dangerouslySetInnerHTML={{
98+
__html: `
10099
docsearch({
101100
apiKey: 'd103541f3e6041148aade2e746ed4d61',
102101
indexName: 'graphql',
103102
inputSelector: '#algolia-search-input'
104103
});
105104
`}} />
106-
<script dangerouslySetInnerHTML={{__html: `
105+
<script dangerouslySetInnerHTML={{
106+
__html: `
107107
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
108108
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
109109
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

0 commit comments

Comments
 (0)