diff options
-rw-r--r-- | HISTORY.md | 11 | ||||
-rw-r--r-- | assets/index/Panel.less | 2 | ||||
-rw-r--r-- | assets/index/Picker.less | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/TimePicker.jsx | 2 | ||||
-rw-r--r-- | src/module/Panel.jsx | 2 |
6 files changed, 13 insertions, 8 deletions
@@ -2,17 +2,22 @@ | |||
2 | 2 | ||
3 | --- | 3 | --- |
4 | 4 | ||
5 | 0.5.6 / 2015-11-20 | 5 | 0.7.0 / 2015-11-20 |
6 | ------------------ | ||
7 | |||
8 | `update` change the className of panel and its container. | ||
9 | |||
10 | 0.5.6 / 2015-11-19 | ||
6 | ------------------ | 11 | ------------------ |
7 | 12 | ||
8 | `fix` use another method to change time and fix the bug about value.getTime(). | 13 | `fix` use another method to change time and fix the bug about value.getTime(). |
9 | 14 | ||
10 | 0.5.4 / 2015-11-20 | 15 | 0.5.4 / 2015-11-19 |
11 | ------------------ | 16 | ------------------ |
12 | 17 | ||
13 | `update` change value prop to defaultValue. | 18 | `update` change value prop to defaultValue. |
14 | 19 | ||
15 | 0.5.2 / 2015-11-20 | 20 | 0.5.2 / 2015-11-19 |
16 | ------------------ | 21 | ------------------ |
17 | 22 | ||
18 | `update` renew placements config. | 23 | `update` renew placements config. |
diff --git a/assets/index/Panel.less b/assets/index/Panel.less index 0abdbfb..a11c4aa 100644 --- a/assets/index/Panel.less +++ b/assets/index/Panel.less | |||
@@ -1,4 +1,4 @@ | |||
1 | .@{prefixClass}-panel { | 1 | .@{prefixClass}-panel-inner { |
2 | display: inline-block; | 2 | display: inline-block; |
3 | position: relative; | 3 | position: relative; |
4 | outline: none; | 4 | outline: none; |
diff --git a/assets/index/Picker.less b/assets/index/Picker.less index c8de18a..dc1fbbd 100644 --- a/assets/index/Picker.less +++ b/assets/index/Picker.less | |||
@@ -1,4 +1,4 @@ | |||
1 | .@{prefixClass}-container { | 1 | .@{prefixClass}-panel { |
2 | z-index: 1070; | 2 | z-index: 1070; |
3 | position: absolute; | 3 | position: absolute; |
4 | 4 | ||
diff --git a/package.json b/package.json index 8ecd8af..e721be7 100644 --- a/package.json +++ b/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "rc-time-picker", | 2 | "name": "rc-time-picker", |
3 | "version": "0.6.0", | 3 | "version": "0.7.0", |
4 | "description": "React TimePicker", | 4 | "description": "React TimePicker", |
5 | "keywords": [ | 5 | "keywords": [ |
6 | "react", | 6 | "react", |
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx index f0b580c..060446a 100644 --- a/src/TimePicker.jsx +++ b/src/TimePicker.jsx | |||
@@ -148,7 +148,7 @@ const Picker = React.createClass({ | |||
148 | 148 | ||
149 | return ( | 149 | return ( |
150 | <Trigger | 150 | <Trigger |
151 | prefixCls={`${prefixCls}-container`} | 151 | prefixCls={`${prefixCls}-panel`} |
152 | popup={this.getPanelElement()} | 152 | popup={this.getPanelElement()} |
153 | popupAlign={align} | 153 | popupAlign={align} |
154 | builtinPlacements={placements} | 154 | builtinPlacements={placements} |
diff --git a/src/module/Panel.jsx b/src/module/Panel.jsx index d5e1521..e372774 100644 --- a/src/module/Panel.jsx +++ b/src/module/Panel.jsx | |||
@@ -90,7 +90,7 @@ const Panel = React.createClass({ | |||
90 | const cls = classnames({ 'narrow': !this.showHour || !this.showSecond }); | 90 | const cls = classnames({ 'narrow': !this.showHour || !this.showSecond }); |
91 | 91 | ||
92 | return ( | 92 | return ( |
93 | <div className={`${prefixCls}-panel ${cls}`}> | 93 | <div className={`${prefixCls}-panel-inner ${cls}`}> |
94 | <Header | 94 | <Header |
95 | prefixCls={prefixCls} | 95 | prefixCls={prefixCls} |
96 | gregorianTimePickerLocale={value.locale} | 96 | gregorianTimePickerLocale={value.locale} |