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 TimePicker am/pm buttons #2757

Merged
merged 3 commits into from
Jan 3, 2016
Merged

Conversation

netoctone
Copy link
Contributor

Hello,

Here's second part of TimePicker update #2358

Let me know if we need ripple effect on "am"/"pm" switches and/or on "hour"/"minute" mode switches.

@netoctone
Copy link
Contributor Author

(aim to fix #2323)

@oliviertassinari oliviertassinari added PR: Needs Review design: material This is about Material Design, please involve a visual or UX designer in the process labels Jan 2, 2016
@oliviertassinari
Copy link
Member

The PR:
capture d ecran 2016-01-02 a 17 57 12

The spec:
capture d ecran 2016-01-02 a 17 57 34

@netoctone That looks good 👍

position: 'relative',
lineHeight: '17px',
height: 17,
fontSize: '17px',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fontSize: 17, is enough.

{min}
</span>
<div style={this.prepareStyles(styles.text)}>
<div style={this.prepareStyles(styles.affix)} />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

switched from invisible text to flexbox
looks a bit cleaner
will check on IE/Safari later

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have tested it on Safari, latest version.
That's better like this.
For IE, I let you test it.
Otherwise, I'm ok to merge this PR 👍 .

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works good in IE 10, 11

oliviertassinari added a commit that referenced this pull request Jan 3, 2016
[TimePicker] improve am/pm buttons
@oliviertassinari oliviertassinari merged commit 66132b6 into mui:master Jan 3, 2016
@oliviertassinari
Copy link
Member

@netoctone Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
design: material This is about Material Design, please involve a visual or UX designer in the process
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants