Skip to content

Commit

Permalink
Installation instructions (#7858)
Browse files Browse the repository at this point in the history
Combine "download" and "getting started" into one new "Installation" page.

* more installation instructions

* cdn instructions

* fix wording

* create-react-app -> Create React App

* new -> single page

* fix npm install instructions

* break out single html file into its own file

* another sentence

* use babel standalone

* enabling es6 and jsx

* remove old getting started
  • Loading branch information
Kevin Lacker committed Oct 4, 2016
1 parent 46983cf commit cb862e1
Show file tree
Hide file tree
Showing 12 changed files with 105 additions and 730 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docs/code
docs/_site
docs/.sass-cache
docs/js/*
docs/downloads
docs/downloads/*.zip
docs/vendor/bundle
examples/shared/*.js
examples/**/bundle.js
Expand Down
2 changes: 0 additions & 2 deletions docs/_data/nav_docs_old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
title: React (Virtual) DOM Terminology
- title: Old Quick Start
items:
- id: getting-started
title: Getting Started
- id: tutorial
title: Tutorial
- id: thinking-in-react
Expand Down
6 changes: 5 additions & 1 deletion docs/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
</a>
<ul class="nav-site nav-site-internal">
<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>
<li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>Download</a></li>
<li><a href="/react/community/support.html"{% if page.sectionid == 'community' %} class="active"{% endif %}>Community</a></li>
<li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
<li>
Expand All @@ -75,8 +74,13 @@
</div>

<div class="buttons-unit">
<<<<<<< HEAD
<a href="/react/docs/getting-started.html" class="button">Get Started</a>
<a href="/react/docs/tutorial.html" class="button">Take the Tutorial</a>
=======
<a href="/react/docs/installation.html" class="button">Get Started</a>
<a href="/react/downloads.html" class="button">Download React v{{site.react_version}}</a>
>>>>>>> 46983cf36c2e2b7e5eeae4f76273cd0daf299b7e
</div>
</div>
</div>
Expand Down
123 changes: 0 additions & 123 deletions docs/docs-old/getting-started.it-IT.md

This file was deleted.

121 changes: 0 additions & 121 deletions docs/docs-old/getting-started.ja-JP.md

This file was deleted.

0 comments on commit cb862e1

Please sign in to comment.