Move calendar inside date picker

react-toolbox · Oct 20, 2015 · 23bbfb9 · 23bbfb9
1 parent 07c17b0
commit 23bbfb9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/components/calendar/day.jsx → components/date_picker/calendar/day.jsx b/components/calendar/day.jsx → components/date_picker/calendar/day.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PureRenderMixin from 'react-addons-pure-render-mixin';
+import time from '../../utils/time';
 import style from './style';
-import time from '../utils/time';
 
 export default React.createClass({
   mixins: [PureRenderMixin],

diff --git a/components/calendar/index.jsx → components/date_picker/calendar/index.jsx b/components/calendar/index.jsx → components/date_picker/calendar/index.jsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 import CSSTransitionGroup from 'react-addons-css-transition-group';
-import { SlideLeft, SlideRight } from '../animations';
-import FontIcon from '../font_icon';
-import Ripple from '../ripple';
+import { SlideLeft, SlideRight } from '../../animations';
+import FontIcon from '../../font_icon';
+import Ripple from '../../ripple';
+import utils from '../../utils';
 import Month from './month';
 import style from './style';
-import utils from '../utils';
 
 export default React.createClass({
   mixins: [PureRenderMixin],

diff --git a/components/calendar/month.jsx → components/date_picker/calendar/month.jsx b/components/calendar/month.jsx → components/date_picker/calendar/month.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import PureRenderMixin from 'react-addons-pure-render-mixin';
+import utils from '../../utils';
 import Day from './day';
 import style from './style';
-import utils from '../utils';
 
 export default React.createClass({
   mixins: [PureRenderMixin],

diff --git a/components/calendar/style.scss → components/date_picker/calendar/style.scss b/components/calendar/style.scss → components/date_picker/calendar/style.scss
@@ -1,4 +1,4 @@
-@import "../variables";
+@import "../../variables";
 
 $calendar-primary: $color-primary;
 $calendar-primary-contrast: $color-primary-contrast;

diff --git a/components/date_picker/dialog.jsx b/components/date_picker/dialog.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 import style from './style';
 import time from '../utils/time';
-import Calendar from '../calendar';
+import Calendar from './calendar';
 import Dialog from '../dialog';
 
 export default React.createClass({