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

[core] Fix some DashboardLayout bugs and make some docs examples more consis… #3905

Merged
merged 12 commits into from
Aug 9, 2024
Merged

[core] Fix some DashboardLayout bugs and make some docs examples more consis… #3905

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cd5ce4b
Fix some DashboardLayout bugs and make some docs examples more consis…
apedroferreira Aug 7, 2024
e82b611
Merge remote-tracking branch 'upstream/master' into core-docs-fixes
apedroferreira Aug 7, 2024
33fe7c0
Merge remote-tracking branch 'upstream/master' into core-docs-fixes
apedroferreira Aug 9, 2024
126661a
Move example
apedroferreira Aug 9, 2024
b682fb5
Merge branch 'master' into core-docs-fixes
Janpot Aug 9, 2024
5658dc0
Add todos
apedroferreira Aug 9, 2024
412a7b8
ugh
apedroferreira Aug 9, 2024
cdc45a6
Make it clearer
apedroferreira Aug 9, 2024
634b330
Merge branch 'master' into core-docs-fixes
apedroferreira Aug 9, 2024
0cd37ed
Remove unneeded check
apedroferreira Aug 9, 2024
b93880f
Simplify more
apedroferreira Aug 9, 2024
b426317
More nit simplifications I have to stop
apedroferreira Aug 9, 2024
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into core-docs-fixes
  • Loading branch information
@apedroferreira
apedroferreira committed Aug 9, 2024
commit 33fe7c09e60af11a9ef9176b74f8b102c8095fc8
2 changes: 1 addition & 1 deletion docs/data/toolpad/core/introduction/TutorialPages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { Typography } from '@mui/material';
import { extendTheme } from '@mui/material/styles';
import { createTheme } from '@mui/material/styles';
import DashboardIcon from '@mui/icons-material/Dashboard';
import TimelineIcon from '@mui/icons-material/Timeline';
import { AppProvider } from '@toolpad/core/AppProvider';
Expand Down
2 changes: 1 addition & 1 deletion docs/data/toolpad/core/introduction/TutorialPages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { Typography } from '@mui/material';
import { extendTheme } from '@mui/material/styles';
import { createTheme } from '@mui/material/styles';
import DashboardIcon from '@mui/icons-material/Dashboard';
import TimelineIcon from '@mui/icons-material/Timeline';
import { AppProvider } from '@toolpad/core/AppProvider';
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.