diff options
author | MG12 <wuzhao.mail@gmail.com> | 2015-11-19 09:40:27 +0800 |
---|---|---|
committer | MG12 <wuzhao.mail@gmail.com> | 2015-11-19 09:40:27 +0800 |
commit | cadce7b210a339bb701f639c4bff65a2157e13de (patch) | |
tree | 251448b4d1295d23467fd91cacb2ed863205e30a | |
parent | 63541ed7b1c9ad58348ea86c97f3e8b31830535b (diff) | |
download | time-picker-0.5.4.tar.gz time-picker-0.5.4.tar.zst time-picker-0.5.4.zip |
-rw-r--r-- | HISTORY.md | 7 | ||||
-rw-r--r-- | assets/index.less | 2 | ||||
-rw-r--r-- | assets/index/Panel.less (renamed from assets/index/TimePanel.less) | 1 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/TimePicker.jsx | 2 |
5 files changed, 9 insertions, 5 deletions
@@ -3,7 +3,12 @@ History | |||
3 | 3 | ||
4 | --- | 4 | --- |
5 | 5 | ||
6 | 0.5.0 / 2015-11-18 | 6 | 0.5.1 / 2015-11-19 |
7 | ------------------ | ||
8 | |||
9 | `update` change the className of select panel container. | ||
10 | |||
11 | 0.5.0 / 2015-11-19 | ||
7 | ------------------ | 12 | ------------------ |
8 | 13 | ||
9 | `update` clear input content and close select panel when click [x] on select panel. | 14 | `update` clear input content and close select panel when click [x] on select panel. |
diff --git a/assets/index.less b/assets/index.less index bc904de..36156cb 100644 --- a/assets/index.less +++ b/assets/index.less | |||
@@ -17,7 +17,7 @@ | |||
17 | } | 17 | } |
18 | 18 | ||
19 | @import "./index/Picker"; | 19 | @import "./index/Picker"; |
20 | @import "./index/TimePanel"; | 20 | @import "./index/Panel"; |
21 | @import "./index/Header"; | 21 | @import "./index/Header"; |
22 | @import "./index/Combobox"; | 22 | @import "./index/Combobox"; |
23 | @import "./index/Select"; | 23 | @import "./index/Select"; |
diff --git a/assets/index/TimePanel.less b/assets/index/Panel.less index 574605f..0abdbfb 100644 --- a/assets/index/TimePanel.less +++ b/assets/index/Panel.less | |||
@@ -2,7 +2,6 @@ | |||
2 | display: inline-block; | 2 | display: inline-block; |
3 | position: relative; | 3 | position: relative; |
4 | outline: none; | 4 | outline: none; |
5 | font-family: Arial, "Hiragino Sans GB", "Microsoft Yahei", "Microsoft Sans Serif", "WenQuanYi Micro Hei", sans-serif; | ||
6 | border: 1px solid #ccc; | 5 | border: 1px solid #ccc; |
7 | list-style: none; | 6 | list-style: none; |
8 | font-size: 12px; | 7 | font-size: 12px; |
diff --git a/package.json b/package.json index 03cd1d9..437d9b1 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.5.0", | 3 | "version": "0.5.1", |
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 78d6de6..a6ea7a9 100644 --- a/src/TimePicker.jsx +++ b/src/TimePicker.jsx | |||
@@ -138,7 +138,7 @@ const Picker = React.createClass({ | |||
138 | 138 | ||
139 | return ( | 139 | return ( |
140 | <Trigger | 140 | <Trigger |
141 | prefixCls={prefixCls} | 141 | prefixCls={`${prefixCls}-picker-container`} |
142 | popup={this.getPanelElement()} | 142 | popup={this.getPanelElement()} |
143 | popupAlign={align} | 143 | popupAlign={align} |
144 | builtinPlacements={placements} | 144 | builtinPlacements={placements} |