Skip to content

Commit 863012d

Browse files
authored
Merge pull request #209 from reactjs/sync-ee75c297
Sync with reactjs.org @ ee75c29
2 parents 4df7f28 + d20ed5c commit 863012d

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

content/community/team.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ Brian studied art in college and did programming on the side to pay for his educ
3838

3939
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.
4040

41-
### Dominic Gannaway {#dominic-gannaway}
42-
43-
![Dominic](../images/team/trueadm.jpg)
44-
45-
[@trueadm on GitHub](https://github.com/trueadm) · [@trueadm on Twitter](https://twitter.com/trueadm)
46-
47-
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.
48-
4941
### Luna Ruan {#luna-ruan}
5042

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

6355
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.
6456

57+
### Rick Hanlon {#rick-hanlon}
58+
59+
![Ricky](../images/team/rickhanlonii.jpg)
60+
61+
[@rickhanlonii on GitHub](https://github.com/rickhanlonii) · [@rickhanlonii on Twitter](https://twitter.com/rickhanlonii)
62+
63+
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.
64+
6565
### Sebastian Markbåge {#sebastian-markbage}
6666

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

7171
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.
7272

73-
### Yuzhi Zheng {#yuzhi-zheng}
74-
75-
![Yuzhi](../images/team/yuzhi.jpg)
73+
### Seth Webster {#seth-webster}
7674

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

79-
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.
77+
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.
8078

8179
## Acknowledgements {#acknowledgements}
8280

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

118118
This list is not exhaustive.
119119

content/docs/conditional-rendering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Deklarowanie zmiennej oraz stosowanie instrukcji `if` to dobry sposób na warunk
122122

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

125-
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.
125+
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.
126126

127127
```js{6-10}
128128
function Mailbox(props) {

content/images/team/rickhanlonii.jpg

278 KB
Loading

content/images/team/sethwebster.jpg

301 KB
Loading

src/pages/acknowledgements.html.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const Acknowlegements = ({data, location}) => (
7777
Dmitriowi Voronianskiemu
7878
</a>{' '}
7979
za pozwolenie nam na wykorzystanie motywu{' '}
80-
<a href="https://labs.voronianski.com/oceanic-next-color-scheme/">
80+
<a href="https://labs.voronianski.dev/oceanic-next-color-scheme/">
8181
Oceanic Next
8282
</a>{' '}
8383
na naszej stronie.

0 commit comments

Comments
 (0)