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

[material-ui] Refine and unify custom template themes #43220

Merged
merged 67 commits into from
Aug 16, 2024
Merged

[material-ui] Refine and unify custom template themes #43220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
f81b154
Clean up landing page template theme
zanivan Aug 5, 2024
946cc5f
Add missing components to theme
zanivan Aug 5, 2024
eed2a8f
Standardize theme folder across all templates
zanivan Aug 5, 2024
ab81559
Run docs:typescript
zanivan Aug 5, 2024
a2d4b26
Stray visual tweaks
zanivan Aug 7, 2024
88a11ea
Merge branch 'next' into refine-custom-theme
zanivan Aug 7, 2024
eca042e
Stray design tweaks
zanivan Aug 7, 2024
8dd2aae
Stray tweaks on marketing-page template
zanivan Aug 7, 2024
41a3106
Merge branch 'next' into refine-custom-theme
zanivan Aug 7, 2024
607ddc4
Run docs:typescript:formatted
zanivan Aug 7, 2024
3a1d012
Fix imports
zanivan Aug 8, 2024
cccb5d1
Fix input padding
zanivan Aug 8, 2024
10746f8
Test screenshots
zanivan Aug 8, 2024
9118043
Tweaks to sign-in and sign-up
zanivan Aug 8, 2024
2bc6df6
Standardizing colors
zanivan Aug 9, 2024
edf8702
Merge branch 'next' into refine-custom-theme
zanivan Aug 9, 2024
cee9709
Merge branch 'next' into refine-custom-theme
zanivan Aug 12, 2024
4cdf224
Clean up dashboard theme
zanivan Aug 13, 2024
594126e
Fix lint
zanivan Aug 13, 2024
488f125
Remove outdated pricing imports
zanivan Aug 13, 2024
4f5be73
Clean up test regressions
zanivan Aug 13, 2024
fdecca2
Fix tests
zanivan Aug 13, 2024
f84f057
Fix regression tests
zanivan Aug 13, 2024
7da8ba0
Add missing test
zanivan Aug 13, 2024
2db4070
Add update tempaltes theme script and CI check
DiegoAndai Aug 14, 2024
80462ed
Add shared theme files
DiegoAndai Aug 14, 2024
f2404cb
Improve CI check
DiegoAndai Aug 14, 2024
46f5aa0
Commit incorrect edit of shared theme file to test CI check
DiegoAndai Aug 14, 2024
4b10844
Revert "Commit incorrect edit of shared theme file to test CI check"
DiegoAndai Aug 14, 2024
59fa3e4
Improve script
DiegoAndai Aug 14, 2024
049dfab
Make the templates respect the user's system color mode
zanivan Aug 15, 2024
f9edd82
Make selected color mode persist between reload
zanivan Aug 15, 2024
4454144
Clean up landing page template theme
zanivan Aug 5, 2024
3506ced
Add missing components to theme
zanivan Aug 5, 2024
38c5294
Standardize theme folder across all templates
zanivan Aug 5, 2024
ebed551
Run docs:typescript
zanivan Aug 5, 2024
9afc729
Stray visual tweaks
zanivan Aug 7, 2024
a90bfdf
Stray design tweaks
zanivan Aug 7, 2024
d674b4f
Stray tweaks on marketing-page template
zanivan Aug 7, 2024
a8494b0
Run docs:typescript:formatted
zanivan Aug 7, 2024
2422ad1
Fix imports
zanivan Aug 8, 2024
b0e94a1
Fix input padding
zanivan Aug 8, 2024
8b935c6
Test screenshots
zanivan Aug 8, 2024
bc04345
Tweaks to sign-in and sign-up
zanivan Aug 8, 2024
b51591a
Standardizing colors
zanivan Aug 9, 2024
7a02484
Clean up dashboard theme
zanivan Aug 13, 2024
923bbe5
Fix lint
zanivan Aug 13, 2024
fe5d32c
Remove outdated pricing imports
zanivan Aug 13, 2024
218f25e
Clean up test regressions
zanivan Aug 13, 2024
c637a27
Fix tests
zanivan Aug 13, 2024
bed2833
Fix regression tests
zanivan Aug 13, 2024
6980a0c
Add missing test
zanivan Aug 13, 2024
0e88852
Add update tempaltes theme script and CI check
DiegoAndai Aug 14, 2024
4979d7e
Add shared theme files
DiegoAndai Aug 14, 2024
672299b
Improve CI check
DiegoAndai Aug 14, 2024
a389b9d
Commit incorrect edit of shared theme file to test CI check
DiegoAndai Aug 14, 2024
c3fd74a
Revert "Commit incorrect edit of shared theme file to test CI check"
DiegoAndai Aug 14, 2024
9b639e5
Improve script
DiegoAndai Aug 14, 2024
5793f69
Make the templates respect the user's system color mode
zanivan Aug 15, 2024
56ea32d
Make selected color mode persist between reload
zanivan Aug 15, 2024
1c81f6d
Fix imports
aarongarciah Aug 16, 2024
156f24a
Update theme
aarongarciah Aug 16, 2024
f755c42
Merge branch 'refine-custom-theme' of https://github.com/mui/material…
zanivan Aug 16, 2024
7a2a1df
Remove outdated theme files
zanivan Aug 16, 2024
b5d29e0
Merge branch 'next' into refine-custom-theme
zanivan Aug 16, 2024
a94c233
Run scripts
zanivan Aug 16, 2024
3e5adcd
Small fix
zanivan Aug 16, 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 branch 'next' into refine-custom-theme
  • Loading branch information
@zanivan
zanivan committed Aug 7, 2024
commit 88a11ea403f08861af442b592f0c974166b36072
2 changes: 1 addition & 1 deletion docs/data/material/getting-started/templates/marketing-page/MarketingPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ToggleCustomTheme.propTypes = {
export default function MarketingPage() {
const [mode, setMode] = React.useState('light');
const [showCustomTheme, setShowCustomTheme] = React.useState(true);
const LPtheme = createTheme(getMPTheme(mode));
const MPTheme = createTheme(getMPTheme(mode));
const defaultTheme = createTheme({ palette: { mode } });

const toggleColorMode = () => {
Expand Down
2 changes: 1 addition & 1 deletion docs/data/material/getting-started/templates/marketing-page/MarketingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function ToggleCustomTheme({
export default function MarketingPage() {
const [mode, setMode] = React.useState<PaletteMode>('light');
const [showCustomTheme, setShowCustomTheme] = React.useState(true);
const LPtheme = createTheme(getMPTheme(mode));
const MPTheme = createTheme(getMPTheme(mode));
const defaultTheme = createTheme({ palette: { mode } });

const toggleColorMode = () => {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.