diff --git a/components/timepicker/demo/basic.md b/components/timepicker/demo/basic.md
index ce13f11ae42c92c74d9f8c4b99db4c6cbfc7b684..5cf74726ca050eef0f345b5f0ae9dab9fe55ad2f 100644
--- a/components/timepicker/demo/basic.md
+++ b/components/timepicker/demo/basic.md
@@ -8,9 +8,9 @@
---
````jsx
-import { TimePicker } from 'antd';
+import { Timepicker } from 'antd';
ReactDOM.render(
-
+
, document.getElementById('components-timepicker-demo-basic'));
````
diff --git a/components/timepicker/demo/disabled.md b/components/timepicker/demo/disabled.md
index 1e131acfa106973f689486e7e94075efbb2006bc..c8f6263367f939726ea447de0fe971c18bd00f50 100644
--- a/components/timepicker/demo/disabled.md
+++ b/components/timepicker/demo/disabled.md
@@ -8,9 +8,9 @@
---
````jsx
-import { TimePicker } from 'antd';
+import { Timepicker } from 'antd';
ReactDOM.render(
-
+
, document.getElementById('components-timepicker-demo-disabled'));
````
diff --git a/components/timepicker/demo/special-minutes.md b/components/timepicker/demo/special-minutes.md
index 2ef89cbf27e2f430384a2bbf1639883bbc40ba58..1baa1298a9ca5ba5a69437f31ef05206a8e0e8a8 100644
--- a/components/timepicker/demo/special-minutes.md
+++ b/components/timepicker/demo/special-minutes.md
@@ -8,9 +8,9 @@
---
````jsx
-import { TimePicker } from 'antd';
+import { Timepicker } from 'antd';
ReactDOM.render(
-
+
, document.getElementById('components-timepicker-demo-special-minutes'));
````
diff --git a/components/timepicker/demo/without-seconds.md b/components/timepicker/demo/without-seconds.md
index c8965049fba8894caf7e1c59f0724b070fce9d89..9c61f48f095b3ba5ab8ccea3725c30333e702e9f 100644
--- a/components/timepicker/demo/without-seconds.md
+++ b/components/timepicker/demo/without-seconds.md
@@ -8,9 +8,9 @@
---
````jsx
-import { TimePicker } from 'antd';
+import { Timepicker } from 'antd';
ReactDOM.render(
-
+
, document.getElementById('components-timepicker-demo-without-seconds'));
````
diff --git a/components/timepicker/index.jsx b/components/timepicker/index.jsx
index 109e827516f653c1db0a6b026f62deac3e992cc2..4da870cff46a3b1ddf2f3f6eb01ce19e8fff9977 100644
--- a/components/timepicker/index.jsx
+++ b/components/timepicker/index.jsx
@@ -8,7 +8,7 @@ import TimePanel from 'rc-time-picker/lib/TimePanel';
// import defaultLocale from './locale';
import TimePickerLocale from 'rc-time-picker/lib/locale/zh_CN';
-const AntTimePicker = React.createClass({
+const AntTimepicker = React.createClass({
getDefaultProps() {
return {
@@ -69,4 +69,4 @@ const AntTimePicker = React.createClass({
});
-export default AntTimePicker;
+export default AntTimepicker;
diff --git a/components/timepicker/index.md b/components/timepicker/index.md
index 676b94012ee48493f32fe5da24cc17561bec1fc7..c1e6a5ad0f4e2bb37aeff2e599efc1c2e335b49f 100644
--- a/components/timepicker/index.md
+++ b/components/timepicker/index.md
@@ -1,4 +1,4 @@
-TimePicker
+Timepicker
==========
- category: Components
@@ -18,7 +18,7 @@ API
---
```html
-
+
```
| 参数 | 说明 | 类型 | 默认值 |
diff --git a/index.js b/index.js
index 9864766f28ac545108ca7610465f9ce8054743a4..f2d2ee14763c512758f27dd08067c91c4f1965b0 100644
--- a/index.js
+++ b/index.js
@@ -59,7 +59,7 @@ const antd = {
Form: require('./components/form').Form,
Input: require('./components/form').Input,
Calendar: require('./components/calendar'),
- TimePicker: require('./components/timepicker'),
+ Timepicker: require('./components/timepicker'),
};
antd.version = require('./package.json').version;
diff --git a/style/components/timepicker.less b/style/components/timepicker.less
index a9681c713f0655f620b44d12627a0c57d7c75b99..393f4ee61145bac5439edd28940cfa35e5011592 100644
--- a/style/components/timepicker.less
+++ b/style/components/timepicker.less
@@ -11,5 +11,4 @@
@import "timepicker/Picker";
@import "timepicker/TimePanel";
@import "timepicker/Header";
-@import "timepicker/Combobox";
@import "timepicker/Select";
diff --git a/style/components/timepicker/Combobox.less b/style/components/timepicker/Combobox.less
deleted file mode 100644
index c540e03c83d3997bb38e1ad9c254fb4d3435be38..0000000000000000000000000000000000000000
--- a/style/components/timepicker/Combobox.less
+++ /dev/null
@@ -1,4 +0,0 @@
-.@{timepicker-prefix-cls} {
- &-combobox {
- }
-}
diff --git a/style/components/timepicker/Select.less b/style/components/timepicker/Select.less
index b31e915931769c309b64b2cc0e80e9a95da71d89..6471213fcbb7e5892b03c20849347d54c2792506 100644
--- a/style/components/timepicker/Select.less
+++ b/style/components/timepicker/Select.less
@@ -39,12 +39,12 @@
user-select: none;
&.selected {
- background: #edfaff;
- color: #2db7f5;
+ background: tint(@primary-color, 90%);
+ color: @link-color;
}
&:hover {
- background: #edfaff;
+ background: tint(@primary-color, 90%);
}
}
}
diff --git a/style/components/timepicker/TimePanel.less b/style/components/timepicker/TimePanel.less
index 02e9dda795b21b0bcbe067c97be1633d3c3875c1..fc6607ee3a1871310f25ea4e9d97d19eb1b7de3b 100644
--- a/style/components/timepicker/TimePanel.less
+++ b/style/components/timepicker/TimePanel.less
@@ -2,13 +2,12 @@
display: inline-block;
position: relative;
outline: none;
- font-family: Arial, "Hiragino Sans GB", "Microsoft Yahei", "Microsoft Sans Serif", "WenQuanYi Micro Hei", sans-serif;
border: 1px solid #ccc;
list-style: none;
font-size: 12px;
text-align: left;
background-color: #fff;
- border-radius: 6px;
+ border-radius: @border-radius-base;
box-shadow: 0 1px 5px #ccc;
background-clip: padding-box;
border: 1px solid #ccc;