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] Vertical scrolling dialog #1045

Merged
merged 6 commits into from
Jul 8, 2015
Merged

Conversation

chrismcv
Copy link
Contributor

@chrismcv chrismcv commented Jul 6, 2015

Hi,
I've started from @jkruder's vertical scrolling dialog #531, and re-merged. Think this is a really useful addition for #525 .

Merge wasn't straightforward, so may have missed a few things. Please have a look and I can make any changes necessary.

Thanks,
Chris

@jkruder
Copy link
Contributor

jkruder commented Jul 6, 2015

Can you update time-picker/time-picker-dialog.jsx as well?

@chrismcv
Copy link
Contributor Author

chrismcv commented Jul 6, 2015

sorry... was running from docs and didn't commit my post-merge changes, which I think covers everything you've pointed out...

@hai-cea
Copy link
Member

hai-cea commented Jul 6, 2015

@chrismcv can you squash please?

@chrismcv
Copy link
Contributor Author

chrismcv commented Jul 6, 2015

seems to be as much as i can easily... that ok?

@jkruder
Copy link
Contributor

jkruder commented Jul 6, 2015

@chrismcv content looks good. Thanks for handling the merge!

@hai-cea
Copy link
Member

hai-cea commented Jul 6, 2015

@chrismcv Thanks for this - I found that the "Scrollable Content and Custom Actions" button does not work for me on the docs site?

@chrismcv
Copy link
Contributor Author

chrismcv commented Jul 6, 2015

oops - i renamed event handlers and missed one.... sorted now

@hai-cea
Copy link
Member

hai-cea commented Jul 7, 2015

Thanks @chrismcv - Just another small fix. Looks like the typography on the title is incorrrect.

This PR:
image

Current on material-ui.com:
image

@chrismcv
Copy link
Contributor Author

chrismcv commented Jul 8, 2015

sorry for the delay, sorted now

@hai-cea
Copy link
Member

hai-cea commented Jul 8, 2015

Thanks @chrismcv @jkruder

hai-cea added a commit that referenced this pull request Jul 8, 2015
[Update] Vertical scrolling dialog
@hai-cea hai-cea merged commit c9ee365 into mui:master Jul 8, 2015
@chrismcv chrismcv mentioned this pull request Jul 8, 2015
@chrismcv chrismcv deleted the vertical-dialog branch February 1, 2016 21:12
mnajdova pushed a commit to mnajdova/material-ui that referenced this pull request Nov 10, 2020
mnajdova pushed a commit to mnajdova/material-ui that referenced this pull request Nov 10, 2020
* Created base <Picker /> component for rendering all possible views

* Recreate TimePicker with new <Picker /> component

* Add TimePicker toolbar and fully replace old TimePickerRoot

* Fix not generating docs when exported several components

* Redo DatePicker on <Picker />

* Grand Views Refactoring

* Fix Root-Pickers tests

* Fix ts errors

* Fix Object(...) is not a function error

* Fix loosing selected meridiem

* Use wildcard import rather than default import (mui#1038)

* [mui#1031] Fix className of ClockNumber selected state (mui#1045)

* Bugfix/spread input props (mui#1046)

* [mui#1031] Fix className of ClockNumber selected state

* [mui#1039] Fix not passing down InputProps

* Make InputProps not required

* Redo DateTimePickerToolbar to use grid

* Get rid of 'selected' and 'disabled' classes

* Fix console warnings
@zannager zannager added the component: dialog This is the name of the generic UI component, not the React module! label Mar 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: dialog This is the name of the generic UI component, not the React module!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants