Skip to content
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
4 changes: 2 additions & 2 deletions docs/src/components/header/HeaderNavDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ const DOCS = [
href: ROUTES.joyDocs,
},
{
name: 'MUI Base',
description: 'Unstyled React components and low-level hooks.',
name: 'Base UI',
description: 'Unstyled components for building accessible UIs.',
href: ROUTES.baseDocs,
},
{
Expand Down
21 changes: 14 additions & 7 deletions docs/src/icons/SvgBaseUiLogo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,29 @@ export default function SvgBaseUiLogo(props: RootSvgProps) {
xmlns="http://www.w3.org/2000/svg"
width={24}
height={24}
viewBox="0 0 24 24"
viewBox="0 0 24 32"
fill="none"
{...props}
>
<path
fillRule="evenodd"
clipRule="evenodd"
fill="#0073E6"
d="M2 0C6.97056 0 11 4.02944 11 9V12H2V0ZM12 24C17.5228 24 22 19.5228 22 14H2C2 19.5228 6.47715 24 12 24ZM21.3149 8.55585C21.7672 9.64778 22 10.8181 22 12H13V3C14.1819 3 15.3522 3.23279 16.4442 3.68508C17.5361 4.13738 18.5282 4.80031 19.364 5.63604C20.1997 6.47177 20.8626 7.46392 21.3149 8.55585Z"
d="M13.3806 8.99097C19.0272 9.33926 23.4996 14.0299 23.4998 19.7644C23.4998 25.5583 18.9351 30.2844 13.2058 30.5457V9.17652L13.2097 9.13355C13.2286 9.03885 13.3093 8.98682 13.3806 8.99097Z"
fill="black"
/>
<path
d="M0.5 0.512695C6.18983 0.800794 10.7939 5.98047 10.7939 12.4238V30.5449C5.10434 30.2567 0.500231 25.0788 0.5 18.6357V0.512695Z"
fill="black"
/>
</RootSvg>
);
}

export const baseSvgLogoString = `<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0C6.97056 0 11 4.02944 11 9V12H2V0ZM12 24C17.5228 24 22 19.5228 22 14H2C2 19.5228 6.47715 24 12 24ZM21.3149 8.55585C21.7672 9.64778 22 10.8181 22 12H13V3C14.1819 3 15.3522 3.23279 16.4442 3.68508C17.5361 4.13738 18.5282 4.80031 19.364 5.63604C20.1997 6.47177 20.8626 7.46392 21.3149 8.55585Z" fill="#0073E6"/>
<path d="M49.0527 31.5786C70.4148 32.8963 87.334 50.6394 87.334 72.3335C87.3338 94.7185 69.3211 112.892 47 113.16V33.5835C47 32.4248 47.9364 31.51 49.0527 31.5786Z" fill="black" stroke="black"/>
<path d="M0.5 0.506836C22.7786 0.801705 40.833 20.7709 40.833 45.4668V113.159C18.5545 112.864 0.500045 92.8957 0.5 68.2002V0.506836Z" fill="black" stroke="black"/>
</svg>`;

export const baseSvgWordmarkString = `<svg xmlns="http://www.w3.org/2000/svg" width="113" height="24" fill="none"><path fill="#0073E6" d="M12 24c5.523 0 10-4.477 10-10H2c0 5.523 4.477 10 10 10ZM2 0a9 9 0 0 1 9 9v3H2V0ZM22 12a9 9 0 0 0-9-9v9h9Z"/><path fill="#090B0B" fill-rule="evenodd" d="M40.112 2.34h-6.144V19.5h6.6c1.888 0 3.336-.4 4.344-1.2 1.024-.8 1.536-2 1.536-3.6v-.096c0-1.152-.28-2.048-.84-2.688-.56-.656-1.424-1.112-2.592-1.368.976-.304 1.672-.768 2.088-1.392.416-.64.624-1.392.624-2.256v-.096c0-1.568-.496-2.704-1.488-3.408-.976-.704-2.352-1.056-4.128-1.056Zm2.424 14.184c-.496.464-1.28.696-2.352.696h-3.096v-5.496h2.88c1.184 0 2.032.224 2.544.672.528.432.792 1.096.792 1.992v.096c0 .896-.256 1.576-.768 2.04Zm-.552-7.56c-.448.4-1.2.6-2.256.6h-2.64V4.62h2.592c1.024 0 1.776.184 2.256.552.48.368.72.96.72 1.776v.096c0 .88-.224 1.52-.672 1.92ZM53.442 19.74a5.397 5.397 0 0 1-2.088-.408 4.95 4.95 0 0 1-1.728-1.2c-.496-.544-.888-1.208-1.176-1.992-.288-.784-.432-1.688-.432-2.712v-.192c0-1.008.144-1.912.432-2.712.304-.816.704-1.504 1.2-2.064a5.26 5.26 0 0 1 1.776-1.32 5.123 5.123 0 0 1 2.136-.456c.96 0 1.752.208 2.376.624.624.4 1.12.912 1.488 1.536V6.948h2.904V19.5h-2.904v-2.064c-.176.304-.4.6-.672.888a4.689 4.689 0 0 1-.936.72 5.51 5.51 0 0 1-1.128.504 4.07 4.07 0 0 1-1.248.192Zm.696-2.304c.464 0 .904-.08 1.32-.24a3.034 3.034 0 0 0 1.08-.768c.304-.352.544-.784.72-1.296.176-.528.264-1.144.264-1.848v-.192c0-1.408-.296-2.448-.888-3.12-.592-.672-1.376-1.008-2.352-1.008-1.008 0-1.808.36-2.4 1.08-.592.72-.888 1.76-.888 3.12v.192c0 1.376.304 2.4.912 3.072.608.672 1.352 1.008 2.232 1.008Zm9.743 1.248c.912.704 2.184 1.056 3.816 1.056 1.616 0 2.856-.344 3.72-1.032.864-.704 1.296-1.696 1.296-2.976 0-.672-.112-1.224-.336-1.656a2.608 2.608 0 0 0-.912-1.08c-.4-.288-.896-.512-1.488-.672a13.956 13.956 0 0 0-1.968-.432c-.496-.08-.912-.168-1.248-.264a4.166 4.166 0 0 1-.816-.312 1.153 1.153 0 0 1-.408-.432 1.435 1.435 0 0 1-.12-.6c0-.448.176-.808.528-1.08.352-.272.84-.408 1.464-.408.672 0 1.176.136 1.512.408.352.272.592.696.72 1.272h2.688c-.08-.704-.264-1.296-.552-1.776a3.274 3.274 0 0 0-1.056-1.176 4.166 4.166 0 0 0-1.512-.648 8.065 8.065 0 0 0-1.8-.192 6.26 6.26 0 0 0-1.728.24c-.56.16-1.064.4-1.512.72a3.563 3.563 0 0 0-1.056 1.176c-.272.464-.408 1.008-.408 1.632 0 .592.08 1.096.24 1.512.16.416.416.776.768 1.08.368.304.84.552 1.416.744.576.192 1.28.352 2.112.48.928.16 1.608.36 2.04.6.432.24.648.616.648 1.128 0 .528-.184.928-.552 1.2-.352.272-.92.408-1.704.408-.864 0-1.48-.176-1.848-.528-.352-.352-.568-.848-.648-1.488H62.44c.064 1.344.544 2.376 1.44 3.096Zm13.945.624c.784.288 1.64.432 2.568.432 1.616 0 2.928-.344 3.936-1.032 1.008-.704 1.616-1.72 1.824-3.048h-2.808c-.112.608-.4 1.08-.864 1.416-.464.336-1.136.504-2.016.504-1.088 0-1.928-.32-2.52-.96-.576-.64-.888-1.56-.936-2.76h9.192v-.84c0-1.12-.168-2.08-.504-2.88-.32-.8-.752-1.456-1.296-1.968a5.072 5.072 0 0 0-1.896-1.128 6.87 6.87 0 0 0-2.232-.36c-.896 0-1.728.16-2.496.48a5.686 5.686 0 0 0-1.968 1.32c-.56.56-1 1.24-1.32 2.04-.304.784-.456 1.664-.456 2.64v.192c0 .992.152 1.88.456 2.664.32.784.76 1.456 1.32 2.016a6.258 6.258 0 0 0 2.016 1.272ZM82.41 9.54c.528.496.832 1.288.912 2.376h-6.264c.144-.976.496-1.736 1.056-2.28.56-.56 1.28-.84 2.16-.84.912 0 1.624.248 2.136.744Zm26.518 9.96V2.34h3.216V19.5h-3.216Zm-17.104-6.528c0 4.416 2.448 6.768 6.744 6.768 4.536 0 6.96-2.472 6.96-6.96V2.34h-3.216v10.176c0 3.552-1.248 4.656-3.72 4.656-2.544 0-3.552-1.296-3.552-4.44V2.34h-3.216v10.632Z" clip-rule="evenodd"/></svg>`;
export const baseSvgWordmarkString = `<svg width="101" height="24" viewBox="0 0 101 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.5332 7.5C15.0034 7.76065 18.4999 11.2625 18.5 15.4922C18.5 19.7323 14.9852 23.2401 10.5 23.4844V7.51465C10.5005 7.51363 10.5022 7.51125 10.5049 7.50879C10.5075 7.50638 10.5106 7.50347 10.5146 7.50195C10.5184 7.50059 10.5246 7.49953 10.5332 7.5Z" fill="black" stroke="black"/>
<path d="M0.5 0.516602C4.93533 0.793268 8.4998 4.72502 8.5 9.59961V23.4824C4.06467 23.2057 0.50017 19.2749 0.5 14.4004V0.516602Z" fill="black" stroke="black"/>
<path d="M39.3827 16.6216C39.3827 21.1351 36.9145 23.8919 33.4318 23.8919C31.6767 23.8919 30.0861 23.1622 29.0714 21.7838V23.6216H26V4H29.2908V11.2973C30.3329 9.91892 31.8412 9.40541 33.4866 9.40541C37.1065 9.40541 39.3827 12.1622 39.3827 16.6216ZM36.0096 16.6216C36.0096 13.7027 34.7207 11.8919 32.5816 11.8919C30.5249 11.8919 29.2085 13.8108 29.2085 16.6216C29.2085 19.4595 30.5523 21.3784 32.6365 21.3784C34.7207 21.3784 36.0096 19.5405 36.0096 16.6216ZM49.4676 23.6216C49.3854 23.0811 49.3579 22.5135 49.3305 21.8108C48.1513 23.2162 46.8076 23.8919 44.5863 23.8919C41.46 23.8919 39.6775 22.3514 39.6775 19.7568C39.6775 15.2973 45.3541 15.2432 48.9466 14.8378V14.2432C48.9466 12.5405 48.0965 11.5946 46.3688 11.5946C44.5863 11.5946 43.599 12.4595 43.5716 13.9459H40.1985C40.3082 11.027 42.694 9.2973 46.3688 9.2973C50.8662 9.2973 52.1551 11.6216 52.1551 15.3514V19.2432C52.1551 20.7838 52.21 22.1351 52.4568 23.6216H49.4676ZM48.9466 17.0541C46.4785 17.3784 43.078 17.3243 43.078 19.7027C43.078 20.8919 43.9281 21.6486 45.4364 21.6486C47.4657 21.6486 48.9466 20.6757 48.9466 17.6486V17.0541ZM56.4004 19.1622C56.4004 20.8378 57.4425 21.6757 59.417 21.6757C60.9801 21.6757 61.9948 21.027 61.9948 19.9459C61.9948 18.5676 60.4043 18.1892 58.5943 17.7568C56.181 17.1892 53.329 16.5676 53.329 13.5135C53.329 10.973 55.6326 9.2973 59.225 9.2973C62.9821 9.2973 65.0937 10.8919 65.0937 13.9459H61.8303C61.7754 12.2973 60.8979 11.6216 59.1153 11.6216C57.6619 11.6216 56.7295 12.2432 56.7295 13.2432C56.7295 14.7568 58.8137 15.0811 60.9253 15.6216C63.1466 16.1892 65.3953 17 65.3953 19.6757C65.3953 22.3514 63.0643 24 59.3896 24C55.3858 24 53.0822 22.3243 53.0273 19.1622H56.4004ZM65.6057 16.5946C65.6057 12.3784 68.2932 9.2973 72.5439 9.2973C75.1491 9.2973 76.959 10.4595 77.9463 12.1622C78.7964 13.6216 79.0706 15.4324 79.0706 17.5946H69.0062C69.0611 19.9459 70.2677 21.6216 72.5713 21.6216C74.0796 21.6216 75.1217 20.8649 75.5604 19.4595H79.0432C78.2754 22.4865 75.9718 24 72.5439 24C67.9916 24 65.6057 21.1622 65.6057 16.5946ZM75.725 15.2162C75.5604 12.8649 74.1618 11.6486 72.3793 11.6486C70.5694 11.6486 69.1433 12.8649 68.9514 15.2162H75.725ZM92.7727 21.8108C91.6758 23.2703 89.9207 23.8919 88.3027 23.8919C86.4653 23.8919 85.1764 23.1892 84.2989 22C83.6133 21.0541 83.4762 19.5946 83.4762 17.5946V9.67568H86.7396V17.4865C86.7396 19.5405 87.0687 21.4324 89.3448 21.4324C90.3321 21.4324 91.1273 21.0811 91.6758 20.3514C92.2243 19.6216 92.5534 18.4595 92.5534 16.7568V9.67568H95.8442V23.6216H92.7727V21.8108ZM97.7092 9.67568H101V23.6216H97.7092V9.67568ZM97.7092 4H101V7.27027H97.7092V4Z" fill="black"/>
</svg>`;
6 changes: 3 additions & 3 deletions docs/src/modules/components/MuiProductSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ const coreProducts = [
},
{
id: 'base-ui',
name: 'MUI Base',
description: 'Unstyled components and hooks.',
icon: <SvgBaseUiLogo width={14} height={14} sx={logoColor} />,
name: 'Base UI',
description: 'Unstyled components for accessible UIs.',
icon: <SvgBaseUiLogo width={14} height={16} sx={logoColor} />,
href: ROUTES.baseDocs,
},
{
Expand Down
6 changes: 3 additions & 3 deletions docs/src/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ const ROUTES = {
support: '/material-ui/getting-started/support/',
goldSponsor: '/material-ui/discover-more/backers/#gold-sponsors',
// Base UI doc pages
baseDocs: '/base-ui/getting-started/',
baseComponents: '/base-ui/all-components/',
baseQuickstart: '/base-ui/getting-started/quickstart/',
baseDocs: 'https://base-ui.com/',
baseComponents: 'https://base-ui.com/react/components',
baseQuickstart: 'https://base-ui.com/react/overview/quick-start',
// Joy UI doc pages
joyDocs: '/joy-ui/getting-started/',
// System pages
Expand Down
4 changes: 1 addition & 3 deletions test/e2e-website/products-drawer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@ test('able to navigate between products', async ({ page }) => {
await expect(page.locator('#mui-product-menu a[href^="/x/react-data-grid/"]')).toBeVisible();
await expect(page.locator('#mui-product-menu a[href^="/x/react-date-pickers/"]')).toBeVisible();

await expect(
page.locator('#mui-product-menu a[href^="/base-ui/getting-started/"]'),
).toBeVisible();
await expect(page.locator('#mui-product-menu a[href^="https://base-ui.com/"]')).toBeVisible();
});
Loading