Sync with reactjs.org @ b1691780 #110
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this functionality with gatsby-remark-external-links plugin
* add React Boston 2019 to conference page * add massachusetts to react-boston listing
* Fix anchor link offset with fixed header * handle h3 too * h4 as an anchor * don't affect UI by any means * no need for px * more fixes * consistency * more consistency * pixel perfection * fix h4 after gatsby-highlight * final touch
The link should probably either go to directly to the beginning of main concepts (which is what my proposes change does), or to the anchor -tag of "Step-by-Step Guide" (#step-by-step-guide). There is no other link in the article which refers to another anchor-tag, that's why I chose to directly link to the main-concepts.
Also add Mongolian and Catalan.
…st. (#1959) * previous page link is not linking to the previous page, but to the second last. The example code is on both, the `Introducing Hooks` as well as `Hooks at a Glance` page, but the linked page is the `Introducing Hooks` and I think that's the right one (the `Hooks at a Glance` page probably got added later?). Not sure about the phrasing so, having "introduce" twice in one sentence ... * Update content/docs/hooks-state.md Co-Authored-By: 0xnoob <[email protected]> Co-authored-by: Alexey Pyltsyn <[email protected]>
|
Deploy preview for ko-reactjs-org ready! Built with commit 08db893 |
taehwanno
reviewed
May 6, 2019
content/docs/getting-started.md
Outdated
| @@ -99,7 +99,11 @@ React 문서는 Javascript 프로그래밍에 익숙한 사람을 대상으로 | |||
|
|
|||
| ### 고급 개념 {#advanced-concepts} | |||
|
|
|||
| <<<<<<< HEAD | |||
content/docs/hooks-state.md
Outdated
| @@ -8,7 +8,11 @@ prev: hooks-overview.html | |||
|
|
|||
| *Hook*은 React 16.8버전에 새로 추가되었습니다. Hook은 클래스 컴포넌트를 작성하지 않아도 state와 같은 특징들을 사용할 수 있습니다. | |||
|
|
|||
| <<<<<<< HEAD | |||
yarn.lock
Outdated
| @@ -11267,13 +11288,29 @@ [email protected]: | |||
| babel-runtime "^6.23.0" | |||
| fbjs "^0.8.14" | |||
|
|
|||
| <<<<<<< HEAD | |||
yarn.lock
Outdated
| @@ -13173,7 +13231,22 @@ unicode-property-aliases-ecmascript@^1.0.4: | |||
| resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0" | |||
| integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg== | |||
|
|
|||
| <<<<<<< HEAD | |||
taehwanno
approved these changes
May 6, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated.
Merge changes from reactjs.org at b169178
The following files have conflicts and may need new translations:
Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.
DO NOT SQUASH MERGE THIS PULL REQUEST!
Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.