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

Fixed broken tabs on docs site #1916

Merged
merged 3 commits into from
Oct 19, 2015
Merged

Conversation

shaurya947
Copy link
Contributor

The history.isActive function was checking for route paths without the leading "/". Fixing that pretty much clears up all currently known broken things with the docs site

The history.isActive function was checking for route paths without the leading "/". Fixing that pretty much clears up all currently known broken things with the docs site
@shaurya947
Copy link
Contributor Author

Addresses issues mentioned in #1884

Basically removed getDOMNode() calls because starting with React 0.14, the actual DOM node is returned and getDOMNode() is no longer necessary.
Again, giant feature buttons on the home page were missing leading "/" in their route attributes.
shaurya947 added a commit that referenced this pull request Oct 19, 2015
@shaurya947 shaurya947 merged commit 02e28f3 into mui:master Oct 19, 2015
@shaurya947 shaurya947 deleted the react-14-route-hotfix branch October 19, 2015 17:39
shaurya947 added a commit that referenced this pull request Oct 21, 2015
Squashed all revert commits into this single one for cleaner history

Revert "Merge pull request #1919 from cgestes/master"

This reverts commit 85d57da, reversing
changes made to 26141b0.

Revert "Merge pull request #1904 from oliviertassinari/docs-scroll"

This reverts commit e754e0f, reversing
changes made to 7943e16.

Revert "Merge pull request #1913 from tomasztomys/feature/react-v0.14-support-grid-list"

This reverts commit 7943e16, reversing
changes made to d310459.

Revert "Merge pull request #1916 from shaurya947/react-14-route-hotfix"

This reverts commit 02e28f3, reversing
changes made to 1e0a4a5.

Conflicts:
	docs/src/app/components/mobile-tear-sheet.jsx

Revert "Merge pull request #1884 from callemall/react-0.14-support"

This reverts commit fa4a019, reversing
changes made to 8819be8.

Conflicts:
	docs/package.json
	docs/src/app/app.jsx
	docs/src/app/components/code-example/code-block.jsx
	docs/src/app/components/pages/components/tabs.jsx
	docs/src/app/components/pages/customization.jsx
	docs/src/app/components/pages/get-started.jsx
	docs/src/app/components/pages/page-with-nav.jsx
	package.json
	src/date-picker/date-picker-dialog.jsx
	src/slider.jsx

Cleaning up some dependency issues and missed merge conflicts
mnajdova pushed a commit to mnajdova/material-ui that referenced this pull request Nov 10, 2020
Bumps [rifm](https://github.com/istarkov/rifm) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/istarkov/rifm/releases)
- [Commits](realadvisor/rifm@v0.11.0...v0.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@zannager zannager added the docs Improvements or additions to the documentation label Mar 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Improvements or additions to the documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants