diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e66cdff2e7..7da24f0944 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,8 +2,6 @@ Thanks for submitting a pull request! Please provide enough information so that > **Unless you are a React Native release maintainer and cherry-picking an *existing* commit into a current release, ensure your pull request is targeting the `master` React Native branch.** -(You can skip this if you're fixing a typo or adding an app to the Showcase.) - Explain the **motivation** for making this change. What existing problem does the pull request solve? Prefer **small pull requests**. These are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c08db03db..53f7c5c889 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,7 @@ The core team will be monitoring for pull requests. When we get one, we'll run s 1. Fork the repo and create your branch from `master`. 2. **Describe your test plan in your commit.** If you've added code that should be tested, add tests! 3. If you've changed APIs, update the documentation. -4. If you've updated the docs, verify the website locally and submit screenshots if applicable +4. If you've updated the docs, verify the website locally and submit screenshots if applicable. ``` $ cd website diff --git a/website/core/Footer.js b/website/core/Footer.js new file mode 100644 index 0000000000..516b178d64 --- /dev/null +++ b/website/core/Footer.js @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule Footer + */ + +var React = require('React'); + +function getGitHubPath(path) { + return 'https://github.com/facebook/react-native/blob/master/' + path; +} + +var Footer = React.createClass({ + render: function() { + return ( +
+ You can edit the content above on GitHub and send us a pull request! +
+ ); + } +}); + +module.exports = Footer; diff --git a/website/core/HeaderWithGithub.js b/website/core/HeaderWithGithub.js index 601051c7e3..c8e87770ce 100644 --- a/website/core/HeaderWithGithub.js +++ b/website/core/HeaderWithGithub.js @@ -12,13 +12,8 @@ var H = require('Header'); var React = require('React'); -function getVersionedGithubPath(path, version) { - version = version || 'next'; - return [ - 'https://github.com/facebook/react-native/blob', - version === 'next' ? 'master' : version + '-stable', - path - ].join('/'); +function getGitHubPath(path) { + return 'https://github.com/facebook/react-native/blob/master/' + path; } var HeaderWithGithub = React.createClass({ @@ -40,7 +35,7 @@ var HeaderWithGithub = React.createClass({diff --git a/website/src/react-native/css/react-native.css b/website/src/react-native/css/react-native.css index d015967f59..cd7ffe8879 100644 --- a/website/src/react-native/css/react-native.css +++ b/website/src/react-native/css/react-native.css @@ -834,8 +834,8 @@ h2 { } .docs-prevnext { - padding-top: 40px; - padding-bottom: 40px; + padding-top: 20px; + padding-bottom: 20px; } .button { @@ -1580,56 +1580,58 @@ input#algolia-doc-search:focus { color: #3B3738; } -.params, .props -{ - border-spacing: 0; - border: 0; - border-collapse: collapse; +.params, .props { + border-spacing: 0; + border: 0; + border-collapse: collapse; } .params .name, .props .name, .name code { - color: #4D4E53; + color: #4D4E53; } -.params td, .params th, .props td, .props th -{ - border: 1px solid #ddd; - margin: 0px; - text-align: left; - vertical-align: top; - padding: 4px 6px; - display: table-cell; +.params td, .params th, .props td, .props th { + border: 1px solid #ddd; + margin: 0px; + text-align: left; + vertical-align: top; + padding: 4px 6px; + display: table-cell; } -.params thead tr, .props thead tr -{ - background-color: hsl(198, 75%, 88%); - font-weight: bold; +.params thead tr, .props thead tr { + background-color: hsl(198, 75%, 88%); + font-weight: bold; } -.params .params thead tr, .props .props thead tr -{ - background-color: #fff; - font-weight: bold; +.params .params thead tr, .props .props thead tr { + background-color: #fff; + font-weight: bold; } .params th, .props th { border-right: 1px solid #aaa; } .params thead .last, .props thead .last { border-right: 1px solid #ddd; } .params td.description > div > p:first-child, -.props td.description > div > p:first-child -{ - margin-top: 0; - padding-top: 0; +.props td.description > div > p:first-child { + margin-top: 0; + padding-top: 0; } .params td.description > p:last-child, -.props td.description > p:last-child -{ - margin-bottom: 0; - padding-bottom: 0; +.props td.description > p:last-child { + margin-bottom: 0; + padding-bottom: 0; } +.edit-page-block { + padding: 5px; + margin-bottom: 40px; + font-size: 12px; + color: #887766; + text-align: center; + background-color: rgba(5, 165, 209, 0.05); +} /** Web player **/