Skip to content

Commit

Permalink
Merge pull request #5129 from Automattic/upgrade/react-day-picker-to-…
Browse files Browse the repository at this point in the history
…1-3-2

Framework: Upgrade react-day-picker to 1.3.2
  • Loading branch information
ockham committed May 2, 2016
2 parents c48d9cf + b8a1736 commit 6035621
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 667 deletions.
12 changes: 6 additions & 6 deletions client/components/date-picker/index.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/**
* External dependencies
*/
var React = require( 'react' ),
DayPicker = require( 'react-day-picker' ),
merge = require( 'lodash/merge' ),
noop = require( 'lodash/noop' );
import React from 'react';
import DayPicker from 'react-day-picker';
import merge from 'lodash/merge';
import noop from 'lodash/noop';

/**
* Internal dependencies
*/
var DayItem = require( 'components/date-picker/day' );
import DayItem from 'components/date-picker/day';

/* Internal dependencies
*/
Expand Down Expand Up @@ -121,7 +121,7 @@ module.exports = React.createClass( {

render: function() {
return (
<div className='date-picker_container' >
<div className="date-picker_container">
<DayPicker
ref="daypicker"
className="date-picker"
Expand Down
9 changes: 9 additions & 0 deletions client/components/date-picker/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ $date-picker_nav_button_size: 20px;
display: table-header-group;
}

.DayPicker-WeekdaysRow {
display: table-row;
}

.DayPicker-Weekday {
display: table-cell;
padding: 15px 0 10px;
Expand All @@ -160,6 +164,11 @@ $date-picker_nav_button_size: 20px;
font-weight: 600;
color: lighten( $gray, 20% );
text-transform: uppercase;

abbr {
border-bottom: none;
cursor: auto;
}
}

.DayPicker-Body {
Expand Down
Loading

0 comments on commit 6035621

Please sign in to comment.