Skip to content

Commit

Permalink
[Datepicker] Fix animations in year container
Browse files Browse the repository at this point in the history
  • Loading branch information
tintin1343 committed Mar 24, 2016
1 parent 83d3522 commit a8e176b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/date-picker/calendar-year.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const CalendarYear = React.createClass({
height: 'inherit',
lineHeight: '36px',
textAlign: 'center',
/* padding: '0px 14px 0 14px',*/
padding: '0px 14px 0 14px',
backgroundColor: backgroundColor,
overflowX: 'hidden',
overflowY: 'scroll',
Expand Down
6 changes: 3 additions & 3 deletions src/date-picker/year-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ function getStyles(props, state) {
display: 'block',
margin: '0 auto',
fontSize: 14,
padding: '8px 2px',
padding: '8px 0px',
color: year === new Date().getFullYear() && datePicker.color,
},
label: {
position: 'relative',
top: -1,
fontSize: hover ? 20 : selected ? 24 : 16,
fontSize: selected ? 24 : 16,
fontWeight: hover ? 450 : selected ? 500 : 400,
color: hover || selected ? datePicker.color : baseTheme.palette.textColor,
alignSelf: 'center',
Expand All @@ -40,7 +40,7 @@ function getStyles(props, state) {
position: 'absolute',
opacity: hover ? 0.6 : selected ? 1 : 0,
borderRadius: '50%',
transform: hover || selected ? 'scale(1.5)' : 'scale(0)',
transform: selected ? 'scale(1.5)' : 'scale(0)',
},
};
}
Expand Down

0 comments on commit a8e176b

Please sign in to comment.