Skip to content

Commit

Permalink
Merge branch 'next' into tigthen-up-docs-website-header
Browse files Browse the repository at this point in the history
  • Loading branch information
danilo-leal committed May 10, 2024
2 parents 17e8084 + 5d3bc83 commit 566ae95
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/data/material/guides/composition/composition.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ import { Link } from 'react-router-dom';

:::warning
However, this strategy suffers from a limitation: prop name collisions.
The component receiving the `component` prop (for example ListItem) might intercept the prop (for example to) that is destined to the leave element (for example Link).
The component receiving the `component` prop (for example ListItem) might intercept the prop (for example to) that is destined to the leaf element (for example Link).
:::

### With TypeScript
Expand Down
5 changes: 0 additions & 5 deletions docs/notifications.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
[
{
"id": 68,
"title": "Check out Base UI today 💥",
"text": "Love Material UI, but don't need Material Design? Try Base UI, the new \"unstyled\" alternative. <a style=\"color: inherit;\" data-ga-event-category=\"Blog\" data-ga-event-action=\"notification\" data-ga-event-label=\"introducing-base-ui\" href=\"/blog/introducing-base-ui/\">Read more in this announcement</a>."
},
{
"id": 78,
"title": "MUI X v6.18.x and the latest improvements before the next major",
Expand Down
9 changes: 4 additions & 5 deletions docs/pages/careers/ROLE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

MUI's story began in 2014 with Material UI, the most successful React implementation of Google's Material Design.
Today, Material UI stands as one of the most popular open-source libraries on GitHub and has paved the way for the fully-fledged startup known as MUI (founded in 2019), which now boasts an ever-expanding ecosystem of React UI products.
We're a company of 31+ people as of late 2023, and we're growing.
We're a company of 35+ people as of early 2024, and we're growing.

## The products

MUI is best known for our flagship product, Material UI—but this is just one of three core component libraries we maintain.
Base UI is our headless component library, and Joy UI is a sister library to Material UI that implements our own in-house Joy Design system.
Base UI is our headless component library, and Pigment CSS is a zero-runtime CSS-in-JS styling engine.
We also host Design Kits and pre-built Templates.

Beyond the core libraries, MUI X offers advanced components like the Data Grid, Date and Time Pickers, and Charts, for more complex user interactions and data visualization needs.
Expand Down Expand Up @@ -72,9 +72,8 @@ Depending on the day, you'll:

## Benefits and compensation

Competitive compensation depending on the profile and location.
We are ready to pay top market rates for a person that can clearly exceed the role's expectations.
You can find the other perks & benefits on the [careers](https://mui.com/careers/#perks-and-benefits) page.
We offer competitive compensation commensurate with your experience level and location and are prepared to pay top market rates for someone who can clearly exceed the role's expectations.
You can find the other perks and benefits on the [careers](https://mui.com/careers/#perks-and-benefits) page.

## How to apply

Expand Down

0 comments on commit 566ae95

Please sign in to comment.