Skip to content

Sync with reactjs.org @ ee75c297 #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions content/community/team.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@ Brian studied art in college and did programming on the side to pay for his educ

Dan got into programming after he accidentally discovered Visual Basic inside Microsoft PowerPoint. He has found his true calling in turning [Sebastian](#sebastian-markbage)'s tweets into long-form blog posts. Dan occasionally wins at Fortnite by hiding in a bush until the game ends.

### Dominic Gannaway {#dominic-gannaway}

![Dominic](../images/team/trueadm.jpg)

[@trueadm on GitHub](https://github.com/trueadm) · [@trueadm on Twitter](https://twitter.com/trueadm)

Dominic is interested in travelling, drum and bass, stand-up comedy and spending time with the family. He most enjoys hacking on new unexplored ideas around UIs and accessibility and has a passion for tweaking and optimizing code to get the most performance out of things.

### Luna Ruan {#luna-ruan}

![Luna](../images/team/lunaruan.jpg)
Expand All @@ -62,6 +54,14 @@ Luna learned programming because she thought it meant creating video games. Inst

Rachel wrote a [book about UI animation](https://abookapart.com/products/animation-at-work) once and worked with MDN and the W3C on the web animations API. Now she is busy with education materials and community engineering on the React team. Secretly, she is an award-winning cartoonist for teenage girls. Catch her making fancy tea with lukewarm water in the microkitchen.

### Rick Hanlon {#rick-hanlon}

![Ricky](../images/team/rickhanlonii.jpg)

[@rickhanlonii on GitHub](https://github.com/rickhanlonii) · [@rickhanlonii on Twitter](https://twitter.com/rickhanlonii)

Ricky majored in theoretical math and somehow found himself on the React Native team for a couple years before joining the React team. When he's not programming you can find him snowboarding, biking, climbing, golfing, or closing GitHub issues that do not match the issue template.

### Sebastian Markbåge {#sebastian-markbage}

![Sebastian](../images/team/sebmarkbage.jpg)
Expand All @@ -70,13 +70,11 @@ Rachel wrote a [book about UI animation](https://abookapart.com/products/animati

Sebastian majored in psychology. He's usually quiet. Even when he says something, it often doesn't make sense to the rest of us until a few months later. The correct way to pronounce his surname is "mark-boa-geh" but he settled for "mark-beige" out of pragmatism -- and that's how he approaches React.

### Yuzhi Zheng {#yuzhi-zheng}

![Yuzhi](../images/team/yuzhi.jpg)
### Seth Webster {#seth-webster}

[@yuzhi on GitHub](https://github.com/yuzhi) · [@yuzhiz on Twitter](https://twitter.com/yuzhiz)
![Seth](../images/team/sethwebster.jpg)

Yuzhi studied Computer Science in school. She liked the instant gratification of seeing code come to life without having to physically be in a laboratory. Now she manages the React team. Before management, she used to work on the Relay data fetching framework. In her spare time, Yuzhi enjoys optimizing her life via gardening and home improvement projects.
Seth started programming as a kid growing up in Tucson, AZ. After school, he was bitten by the music bug and was a touring musician for about 10 years before returning to *work*, starting with Intuit. In his spare time, he loves [taking pictures](https://www.sethwebster.com) and flying for animal rescues in the northeastern United States.

## Acknowledgements {#acknowledgements}

Expand All @@ -93,6 +91,7 @@ React was originally created by [Jordan Walke](https://github.com/jordwalke). To
* [Christoph Nakazawa](https://github.com/cpojer)
* [Christopher Chedeau](https://github.com/vjeux)
* [Clement Hoang](https://github.com/clemmy)
* [Dominic Gannaway](https://github.com/trueadm)
* [Flarnie Marchan](https://github.com/flarnie)
* [Jason Quense](https://github.com/jquense)
* [Jesse Beach](https://github.com/jessebeach)
Expand All @@ -114,6 +113,7 @@ React was originally created by [Jordan Walke](https://github.com/jordwalke). To
* [Sophie Alpert](https://github.com/sophiebits)
* [Sunil Pai](https://github.com/threepointone)
* [Tim Yung](https://github.com/yungsters)
* [Yuzhi Zheng](https://github.com/yuzhi)

This list is not exhaustive.

Expand Down
2 changes: 1 addition & 1 deletion content/docs/conditional-rendering.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Deklarowanie zmiennej oraz stosowanie instrukcji `if` to dobry sposób na warunk

### Wewnątrzliniowy warunek `if` z użyciem logicznego operatora `&&` {#inline-if-with-logical--operator}

JSX umożliwia stosowanie w nawiasach klamrowych [wszelkich wyrażeń](/docs/introducing-jsx.html#embedding-expressions-in-jsx), łącznie z javascriptowym operatorem logicznym `&&`. Jest to przydatne, gdy chcemy jakiś element dołączyć warunkowo.
JSX pozwala [umieszczać w nawiasach klamrowych wyrażenia](/docs/introducing-jsx.html#embedding-expressions-in-jsx), łącznie z javascriptowym operatorem logicznym `&&`. Jest to przydatne, gdy chcemy jakiś element dołączyć warunkowo.

```js{6-10}
function Mailbox(props) {
Expand Down
Binary file added content/images/team/rickhanlonii.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/images/team/sethwebster.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/pages/acknowledgements.html.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const Acknowlegements = ({data, location}) => (
Dmitriowi Voronianskiemu
</a>{' '}
za pozwolenie nam na wykorzystanie motywu{' '}
<a href="https://labs.voronianski.com/oceanic-next-color-scheme/">
<a href="https://labs.voronianski.dev/oceanic-next-color-scheme/">
Oceanic Next
</a>{' '}
na naszej stronie.
Expand Down