Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[docs][TablePagination] Add Tailwind CSS & plain CSS introduction demo #38286

Merged
merged 12 commits into from
Aug 14, 2023
Merged

[docs][TablePagination] Add Tailwind CSS & plain CSS introduction demo #38286

merged 12 commits into from
Aug 14, 2023

Conversation

mnajdova
Copy link
Member

@mnajdova mnajdova commented Aug 2, 2023

Things that are done in the PR:

  • added Tailwind CS S& plain CSS version of the introduction demo
  • refactored Tailwind CSS demos to have custom component

@mnajdova mnajdova added docs Improvements or additions to the documentation package: base-ui Specific to @mui/base component: TablePagination The React component. labels Aug 2, 2023
@mui-bot
Copy link

mui-bot commented Aug 2, 2023 •
edited

Netlify deploy preview

Bundle size report

No bundle size changes (Toolpad)
No bundle size changes

Generated by 🚫 dangerJS against f71d147

@mnajdova mnajdova marked this pull request as ready for review August 3, 2023 08:21
@github-actions github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Aug 3, 2023
@github-actions github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Aug 8, 2023
michaldudak
michaldudak reviewed Aug 8, 2023
View reviewed changes
docs/data/base/components/table-pagination/TableCustomized/tailwind/index.tsx Outdated Show resolved Hide resolved
docs/scripts/formattedTSDemos.js
const prettierConfig = prettier.resolveConfig.sync(jsPath, {
config: path.join(workspaceRoot, 'prettier.config.js'),
});
const prettierFormat = (jsSource) =>
prettier.format(jsSource, { ...prettierConfig, filepath: jsPath });

const prettified = prettierFormat(codeWithPropTypes);
const codeWithoutTsIgnoreComments = codeWithPropTypes.replace(/^\s*\/\/ @ts-ignore.*$/gm, '');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also remove ts-expect-error, or aren't there any occurrences of it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed while doing this that there were other occurrences, so I decided to keep the fix :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's about @ts-ignore comments added in the tsx files that are automatically added in the .js files while running yarn docs:typescript:formatted - @ts-ignore does not make sense in the JavaScript files.

zanivan
zanivan approved these changes Aug 10, 2023
View reviewed changes
Copy link
Contributor

@zanivan zanivan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design-wise, looks good!

However, I really think we should roll back and stop using inter font on Tailwind demo—and sometimes the slate is too bluish when compared to the gray tones we use—but that's for another PR/issue.

@mnajdova
Copy link
Member Author

However, I really think we should roll back and stop using inter font on Tailwind demo

We haven't added it yet, no? Or maybe I misunderstand your point. Should we add the inter font on the Tailwind CSS demos?

@zanivan
Copy link
Contributor

zanivan commented Aug 11, 2023

We haven't added it yet, no? Or maybe I misunderstand your point. Should we add the inter font on the Tailwind CSS demos?

Sorry, I expressed myself very poorly 😅
I mean that we should use the same font family on all demos, the IBM Plex Sans

@mnajdova
Copy link
Member Author

mnajdova commented Aug 14, 2023 •
edited

I mean that we should use the same font family on all demos, the IBM Plex Sans

I see, alright, I am creating #38464

@mnajdova mnajdova merged commit 2bfecd8 into mui:master Aug 14, 2023
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaldudak michaldudak michaldudak left review comments

@zanivan zanivan zanivan approved these changes

@siriwatknp siriwatknp Awaiting requested review from siriwatknp

Assignees
No one assigned
Labels
component: TablePagination The React component. docs Improvements or additions to the documentation package: base-ui Specific to @mui/base
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mnajdova @mui-bot @zanivan @michaldudak