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

Merge from master and React 0.13/ES6 changes #464

Merged
merged 9 commits into from
Mar 28, 2015
Merged

Merge from master and React 0.13/ES6 changes #464

merged 9 commits into from
Mar 28, 2015

Conversation

rob0rt
Copy link
Contributor

@rob0rt rob0rt commented Mar 26, 2015

This PR is a merge of Master into css-in-js, as well as an overhaul of the docs, converting the components into new ES5 Classes as specified in React 0.13.

Other small changes include general code cleanliness, such as converting things like:

var AppBar = mui.AppBar;
var AppCanvas = mui.AppCanvas;
var Menu = mui.Menu;
var IconButton = mui.IconButton;

to:

var { AppBar, AppCanvas, Menu, IconButton } = mui;

As well as whitespace/ newlines (automatically fixed by my IDE).

I did not convert date-picker, menus, and text-fields, as those seemed broken at the current state of the tree so I could not test to make sure I didn't break them.

@rob0rt
Copy link
Contributor Author

rob0rt commented Mar 26, 2015

I also deliberately opened this against css-in-js since I know that's where a lot of work is taking place; I can open it against master if that's better suited.

mmrtnz added a commit that referenced this pull request Mar 28, 2015
Merge from master and React 0.13/ES6 changes
@mmrtnz mmrtnz merged commit 24db37b into mui:css-in-js Mar 28, 2015
@mmrtnz
Copy link
Contributor

mmrtnz commented Mar 28, 2015

Thanks @BobertForever! Yes css-in-js is where all the work is going on. Any PRs to that branch won't be seen until v0.8.0. This was really helpful. I can take a look at what's breaking those components and have them updated to React v0.13.

@rob0rt rob0rt deleted the css-in-js branch March 29, 2015 03:11
@rob0rt rob0rt restored the css-in-js branch March 29, 2015 03:11
@zannager zannager added the package: system Specific to @mui/system label Mar 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
package: system Specific to @mui/system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants