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.

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

Update themes.jsx #1696

Merged
merged 1 commit into from
Sep 25, 2015
Merged

Update themes.jsx #1696

merged 1 commit into from
Sep 25, 2015

Conversation

EcutDavid
Copy link

Fix theme display switch problem in doc.
issue page

@shaurya947
Copy link
Contributor

@EcutDavid we're going to release v0.12 soon and it would probably be a good idea to put this there (since v0.12 deals with theme changes). Do you mind submitting this PR to the v0.12 branch instead?

@EcutDavid
Copy link
Author

@shaurya947 Ok :)

@EcutDavid EcutDavid closed this Sep 23, 2015
@shaurya947
Copy link
Contributor

@EcutDavid we merged v0.12 into master so I'll re-open this. Could you please rebase so we can go ahead and merge this?

@shaurya947 shaurya947 reopened this Sep 23, 2015
@EcutDavid
Copy link
Author

Hi rebase done, and I pull the changes to my repo, what's the next???
It's my first time rebase, a little confuse :(

@shaurya947
Copy link
Contributor

@EcutDavid here's a good overview of what rebasing does (from link):

[Rebasing] works by going to the common ancestor of the two branches (the one you’re on and the one you’re rebasing onto), getting the diff introduced by each commit of the branch you’re on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn.

So once you have rebased, push your local branch (instead of pull, do a force push if needed with the -f flag) so that your remote branch is updated. Let me know if you need more help!

@EcutDavid
Copy link
Author

@shaurya947 Thank you very much, I did it :)

@shaurya947
Copy link
Contributor

@EcutDavid something seems a little off. There are a few commits in the PR that are already in master. Do you mind taking a look again? You got any suggestions @oliviertassinari ?

@EcutDavid
Copy link
Author

Ok, I will take a look again In the midday :)
Live in china, it's 8:30 AM now, and have to work~
My company not allow deliver code @ github during working time.

@oliviertassinari
Copy link
Member

Do you want me to rebase and open a PR with your commits?
I think that we need to fix the theme section of the doc before releasing.

@EcutDavid
Copy link
Author

Sorry, I made some mistake,

@EcutDavid EcutDavid reopened this Sep 25, 2015
@EcutDavid
Copy link
Author

OK it works now~

shaurya947 added a commit that referenced this pull request Sep 25, 2015
@shaurya947 shaurya947 merged commit 5c4b0f8 into mui:master Sep 25, 2015
@shaurya947
Copy link
Contributor

Cool stuff, thanks @EcutDavid!

mnajdova pushed a commit to mnajdova/material-ui that referenced this pull request Nov 10, 2020
* Rename KeyboardIcon to CalendarIcon

The icon components should be named after their content.

* Rename `keyboardIcon` prop to `openPickerIcon` mui#1693

The prop should be named after the icon's functionality/usage. The new name matches the `hideOpenPickerButton` prop. The documentation on the prop already matches this wording. Tested by verifying that the two affected demo pages still work and show the customized icon.

* Update lib/src/_shared/icons/CalendarIcon.tsx

Co-Authored-By: Olivier Tassinari <[email protected]>

Co-authored-by: Dmitriy Kovalenko <[email protected]>
Co-authored-by: Olivier Tassinari <[email protected]>
@zannager zannager added the customization: theme Centered around the theming features label Mar 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
customization: theme Centered around the theming features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants