Skip to content

Commit 7e06ea9

Browse files
author
Kevin Lacker
authored
Getting new-docs ready for launch (#8027)
* remove old docs framey stuff * css tweak, tutorial rename, scrap old stuff * fix the tutorial links * broken link * a slew of broken links * all broken links up to the tips * redirects for all the tips * fix up prev/next links * fix error decoder * remove old folder * move addons to reference * Split Lists and Conditional Rendering (#2) * Split Lists and Conditional Rendering * Update lists-and-keys.md * move around some redirects * point to hello world rather than installation * tweak hello world text * make docs header point to hello world
1 parent 801d726 commit 7e06ea9

37 files changed

+681
-1253
lines changed

docs/_config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ defaults:
3232
values:
3333
layout: docs
3434
sectionid: docs
35-
- scope:
36-
path: docs-old
37-
type: pages
38-
values:
39-
layout: docs-old
40-
sectionid: docs-old
4135
- scope:
4236
path: contributing
4337
type: pages

docs/_data/nav_docs.yml

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
title: Components and Props
1313
- id: state-and-lifecycle
1414
title: State and Lifecycle
15-
- id: lists-conditional-rendering
16-
title: Lists & Conditional Rendering
1715
- id: handling-events
1816
title: Handling Events
17+
- id: conditional-rendering
18+
title: Conditional Rendering
19+
- id: lists-and-keys
20+
title: Lists and Keys
1921
- id: forms
2022
title: Forms
2123
- id: lifting-state-up
@@ -34,16 +36,31 @@
3436
title: Refs and the DOM
3537
- id: optimizing-performance
3638
title: Optimizing Performance
37-
- id: context
38-
title: Context
39-
- id: reconciliation
40-
title: Reconciliation
4139
- id: react-without-es6
4240
title: React Without ES6
4341
- id: react-without-jsx
4442
title: React Without JSX
43+
- id: reconciliation
44+
title: Reconciliation
45+
- id: context
46+
title: Context
4547
- id: web-components
4648
title: Web Components
49+
- title: Reference
50+
items:
51+
- id: react-api
52+
title: React
53+
subitems:
54+
- id: react-component
55+
title: React.Component
56+
- id: react-dom
57+
title: ReactDOM
58+
- id: react-dom-server
59+
title: ReactDOMServer
60+
- id: dom-elements
61+
title: DOM Elements
62+
- id: events
63+
title: SyntheticEvent
4764
- id: addons
4865
title: Add-Ons
4966
subitems:
@@ -63,18 +80,4 @@
6380
title: Shallow Compare
6481
- id: two-way-binding-helpers
6582
title: Two-way Binding Helpers
66-
- title: Reference
67-
items:
68-
- id: react-api
69-
title: React
70-
subitems:
71-
- id: react-component
72-
title: React.Component
73-
- id: react-dom
74-
title: ReactDOM
75-
- id: react-dom-server
76-
title: ReactDOMServer
77-
- id: dom-elements
78-
title: DOM Elements
79-
- id: events
80-
title: SyntheticEvent
83+

docs/_data/nav_docs_old.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

docs/_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</a>
55
<div>
66
<h5><a href="/react/docs/">Docs</a></h5>
7-
<a href="/react/docs/installation.html">Quick Start</a>
7+
<a href="/react/docs/hello-world.html">Quick Start</a>
88
<a href="/react/docs/thinking-in-react.html">Thinking in React</a>
99
<a href="/react/tutorial/tutorial.html">Tutorial</a>
1010
<a href="/react/docs/jsx-in-depth.html">Advanced Guides</a>

docs/_includes/hero.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</div>
77

88
<div class="buttons-unit">
9-
<a href="/react/docs/installation.html" class="button">Get Started</a>
9+
<a href="/react/docs/hello-world.html" class="button">Get Started</a>
1010
<a href="/react/tutorial/tutorial.html" class="button">Take the Tutorial</a>
1111
</div>
1212
</div>

docs/_includes/nav_docs.html

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,42 +36,4 @@ <h3>{{ section.title }}</h3>
3636
</div>
3737
{% endfor %}
3838

39-
<!-- Old Docs Nav -->
40-
<!-- TODO: remove it when new docs are ready -->
41-
{% for section in site.data.nav_docs_old %}
42-
<div class="nav-docs-section">
43-
<h3>{{ section.title }}</h3>
44-
<ul>
45-
{% for item in section.items %}
46-
<li>
47-
{{ item | docs_old_sidebar_link }}
48-
{% if item.subitems %}
49-
<ul>
50-
{% for subitem in item.subitems %}
51-
<li>
52-
{{ subitem | docs_old_sidebar_link }}
53-
</li>
54-
{% endfor %}
55-
</ul>
56-
{% endif %}
57-
</li>
58-
{% endfor %}
59-
</ul>
60-
</div>
61-
{% endfor %}
62-
63-
<!-- Old Tips Nav -->
64-
<!-- TODO: remove it when new docs are ready -->
65-
{% for section in site.data.nav_tips %}
66-
<div class="nav-docs-section">
67-
<h3>{{ section.title }}</h3>
68-
<ul>
69-
{% for item in section.items %}
70-
<li>
71-
<a href="/react/tips/{{ item.id }}.html"{% if page.id == item.id %} class="active"{% endif %}>{{ item.title }}</a>
72-
</li>
73-
{% endfor %}
74-
</ul>
75-
</div>
76-
{% endfor %}
7739
</div>

docs/_includes/navigation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</a>
77
<div class="nav-lists">
88
<ul class="nav-site nav-site-internal">
9-
<li><a href="/react/docs/installation.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
9+
<li><a href="/react/docs/hello-world.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
1010
<li><a href="/react/tutorial/tutorial.html"{% if page.sectionid == 'tutorial' %} class="active"{% endif %}>Tutorial</a></li>
1111
<li><a href="/react/community/support.html"{% if page.sectionid == 'community' %} class="active"{% endif %}>Community</a></li>
1212
<li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>

docs/_layouts/docs-old.html

Lines changed: 0 additions & 27 deletions
This file was deleted.

docs/_posts/2014-01-06-community-roundup-14.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ React is only one-piece of your web application stack. [Mark Lussier](https://gi
2828

2929
## React Rails Tutorial
3030

31-
[Selem Delul](http://selem.im) bundled the [React Tutorial](/react/docs/tutorial.html) into a rails app. This is a good example on how to get started with a rails project.
31+
[Selem Delul](http://selem.im) bundled the [React Tutorial](/react/tutorial/tutorial.html) into a rails app. This is a good example on how to get started with a rails project.
3232

3333
> ```
3434
git clone https://github.com/necrodome/react-rails-tutorial

docs/contributing/how-to-contribute.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title: How to Contribute
44
layout: contributing
55
permalink: contributing/how-to-contribute.html
66
next: codebase-overview.html
7+
redirect_from: "/tips/introduction.html"
78
---
89

910
React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on [facebook.com](https://www.facebook.com). We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and answers some questions that you may have.
@@ -26,7 +27,7 @@ If you send a pull request, please do it against the `master` branch. We maintai
2627

2728
React follows [semantic versioning](http://semver.org/). We release patch versions for bugfixes, minor versions for new features, and major versions for any breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance.
2829

29-
We tag every pull request with a label marking whether the change should go in the next [patch](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-patch), [minor](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-minor), or a [major](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-major) version. We release new patch versions every few weeks, minor versions every few months, and major versions one or two times a year.
30+
We tag every pull request with a label marking whether the change should go in the next [patch](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-patch), [minor](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-minor), or a [major](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-major) version. We release new patch versions every few weeks, minor versions every few months, and major versions one or two times a year.
3031

3132
Every significant change is documented in the [changelog file](https://github.com/facebook/react/blob/master/CHANGELOG.md).
3233

@@ -38,7 +39,7 @@ We are using [GitHub Issues](https://github.com/facebook/react/issues) for our p
3839

3940
#### Reporting New Issues
4041

41-
The best way to get your bug fixed is to provide a reduced test case. This [JSFiddle template](https://jsfiddle.net/reactjs/69z2wepo/) is a great starting point.
42+
The best way to get your bug fixed is to provide a reduced test case. This [JSFiddle template](https://jsfiddle.net/reactjs/69z2wepo/) is a great starting point.
4243

4344
#### Security Bugs
4445

docs/css/react.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,13 @@ h1, h2, h3, h4, h5, h6 {
369369
width: 100%;
370370
padding-bottom: 40px;
371371
}
372-
372+
373373
ul {
374374
list-style: none;
375375
margin: 0;
376376
}
377377
ul ul {
378-
margin: 6px 0 0 20px;
378+
margin: 0 0 6px 20px;
379379
}
380380
li {
381381
line-height: 16px;

0 commit comments

Comments
 (0)