From f65abf1d6d0de11b3cca5ab2a843c25cb9ab2385 Mon Sep 17 00:00:00 2001 From: MG12 Date: Tue, 17 Nov 2015 18:11:46 +0800 Subject: [PATCH] update less file and use variables; rename TimePicker to Timepicker --- components/timepicker/demo/basic.md | 4 ++-- components/timepicker/demo/disabled.md | 4 ++-- components/timepicker/demo/special-minutes.md | 4 ++-- components/timepicker/demo/without-seconds.md | 4 ++-- components/timepicker/index.jsx | 4 ++-- components/timepicker/index.md | 4 ++-- index.js | 2 +- style/components/timepicker.less | 1 - style/components/timepicker/Combobox.less | 4 ---- style/components/timepicker/Select.less | 6 +++--- style/components/timepicker/TimePanel.less | 3 +-- 11 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 style/components/timepicker/Combobox.less diff --git a/components/timepicker/demo/basic.md b/components/timepicker/demo/basic.md index ce13f11ae4..5cf74726ca 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 1e131acfa1..c8f6263367 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 2ef89cbf27..1baa1298a9 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 c8965049fb..9c61f48f09 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 109e827516..4da870cff4 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 676b94012e..c1e6a5ad0f 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 9864766f28..f2d2ee1476 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 a9681c713f..393f4ee611 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 c540e03c83..0000000000 --- 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 b31e915931..6471213fcb 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 02e9dda795..fc6607ee3a 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;