diff options
author | yiminghe <yiminghe@gmail.com> | 2015-11-27 16:15:05 +0800 |
---|---|---|
committer | yiminghe <yiminghe@gmail.com> | 2015-11-27 16:15:05 +0800 |
commit | 8133e8cf3b37b2be764616493ade7c7a7678fce1 (patch) | |
tree | 4321352889ab62f18ff8703adac8756ddb506dc0 /assets/index | |
parent | 7702bb67968104a64fa85ba7e893bf2393eeb3c5 (diff) | |
download | time-picker-8133e8cf3b37b2be764616493ade7c7a7678fce1.tar.gz time-picker-8133e8cf3b37b2be764616493ade7c7a7678fce1.tar.zst time-picker-8133e8cf3b37b2be764616493ade7c7a7678fce1.zip |
add gregorianCalendarLocale prop1.0.0-alpha1
Diffstat (limited to 'assets/index')
-rw-r--r-- | assets/index/Combobox.less | 4 | ||||
-rw-r--r-- | assets/index/Header.less | 7 | ||||
-rw-r--r-- | assets/index/Panel.less | 38 | ||||
-rw-r--r-- | assets/index/Picker.less | 42 | ||||
-rw-r--r-- | assets/index/Select.less | 12 |
5 files changed, 47 insertions, 56 deletions
diff --git a/assets/index/Combobox.less b/assets/index/Combobox.less deleted file mode 100644 index a796d0a..0000000 --- a/assets/index/Combobox.less +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | .@{prefixClass} { | ||
2 | &-combobox { | ||
3 | } | ||
4 | } | ||
diff --git a/assets/index/Header.less b/assets/index/Header.less index ac3d662..7ad3d9f 100644 --- a/assets/index/Header.less +++ b/assets/index/Header.less | |||
@@ -1,8 +1,7 @@ | |||
1 | .@{prefixClass} { | 1 | .@{prefixClass}-panel { |
2 | &-input { | 2 | &-input { |
3 | margin: 0; | 3 | margin: 0; |
4 | padding: 0; | 4 | padding: 0; |
5 | border: 0; | ||
6 | width: 100%; | 5 | width: 100%; |
7 | cursor: auto; | 6 | cursor: auto; |
8 | line-height: 1.5; | 7 | line-height: 1.5; |
@@ -48,7 +47,3 @@ | |||
48 | color: #666; | 47 | color: #666; |
49 | } | 48 | } |
50 | } | 49 | } |
51 | |||
52 | .narrow .@{prefixClass}-input-wrap { | ||
53 | max-width: 111px; | ||
54 | } | ||
diff --git a/assets/index/Panel.less b/assets/index/Panel.less index a11c4aa..be7914f 100644 --- a/assets/index/Panel.less +++ b/assets/index/Panel.less | |||
@@ -1,15 +1,25 @@ | |||
1 | .@{prefixClass}-panel-inner { | 1 | .@{prefixClass}-panel { |
2 | display: inline-block; | 2 | z-index: 1070; |
3 | position: relative; | 3 | width: 170px; |
4 | outline: none; | 4 | position: absolute; |
5 | border: 1px solid #ccc; | 5 | box-sizing: border-box; |
6 | list-style: none; | 6 | |
7 | font-size: 12px; | 7 | * { |
8 | text-align: left; | 8 | box-sizing: border-box; |
9 | background-color: #fff; | 9 | } |
10 | border-radius: 3px; | 10 | |
11 | box-shadow: 0 1px 5px #ccc; | 11 | &-inner { |
12 | background-clip: padding-box; | 12 | display: inline-block; |
13 | border: 1px solid #ccc; | 13 | position: relative; |
14 | line-height: 1.5; | 14 | outline: none; |
15 | list-style: none; | ||
16 | font-size: 12px; | ||
17 | text-align: left; | ||
18 | background-color: #fff; | ||
19 | border-radius: 3px; | ||
20 | box-shadow: 0 1px 5px #ccc; | ||
21 | background-clip: padding-box; | ||
22 | border: 1px solid #ccc; | ||
23 | line-height: 1.5; | ||
24 | } | ||
15 | } | 25 | } |
diff --git a/assets/index/Picker.less b/assets/index/Picker.less index dc1fbbd..76bf834 100644 --- a/assets/index/Picker.less +++ b/assets/index/Picker.less | |||
@@ -1,28 +1,18 @@ | |||
1 | .@{prefixClass}-panel { | 1 | .@{prefixClass} { |
2 | z-index: 1070; | 2 | &-input { |
3 | position: absolute; | 3 | width: 100%; |
4 | 4 | position: relative; | |
5 | &.slide-up-enter.slide-up-enter-active&-placement-topLeft, | 5 | display: inline-block; |
6 | &.slide-up-enter.slide-up-enter-active&-placement-topRight, | 6 | padding: 4px 7px; |
7 | &.slide-up-appear.slide-up-appear-active&-placement-topLeft, | 7 | height: 28px; |
8 | &.slide-up-appear.slide-up-appear-active&-placement-topRight { | 8 | cursor: text; |
9 | animation-name: antSlideDownIn; | 9 | font-size: 12px; |
10 | } | 10 | line-height: 1.5; |
11 | 11 | color: #666; | |
12 | &.slide-up-enter.slide-up-enter-active&-placement-bottomLeft, | 12 | background-color: #fff; |
13 | &.slide-up-enter.slide-up-enter-active&-placement-bottomRight, | 13 | background-image: none; |
14 | &.slide-up-appear.slide-up-appear-active&-placement-bottomLeft, | 14 | border: 1px solid #d9d9d9; |
15 | &.slide-up-appear.slide-up-appear-active&-placement-bottomRight { | 15 | border-radius: 6px; |
16 | animation-name: antSlideUpIn; | 16 | transition: border .2s cubic-bezier(0.645, 0.045, 0.355, 1), background .2s cubic-bezier(0.645, 0.045, 0.355, 1), box-shadow .2s cubic-bezier(0.645, 0.045, 0.355, 1); |
17 | } | ||
18 | |||
19 | &.slide-up-leave.slide-up-leave-active&-placement-topLeft, | ||
20 | &.slide-up-leave.slide-up-leave-active&-placement-topRight { | ||
21 | animation-name: antSlideDownOut; | ||
22 | } | ||
23 | |||
24 | &.slide-up-leave.slide-up-leave-active&-placement-bottomLeft, | ||
25 | &.slide-up-leave.slide-up-leave-active&-placement-bottomRight { | ||
26 | animation-name: antSlideUpOut; | ||
27 | } | 17 | } |
28 | } | 18 | } |
diff --git a/assets/index/Select.less b/assets/index/Select.less index 995d09e..e93e8f7 100644 --- a/assets/index/Select.less +++ b/assets/index/Select.less | |||
@@ -1,4 +1,4 @@ | |||
1 | .@{prefixClass}-select { | 1 | .@{prefixClass}-panel-select { |
2 | float: left; | 2 | float: left; |
3 | overflow-y:auto; | 3 | overflow-y:auto; |
4 | font-size: 12px; | 4 | font-size: 12px; |
@@ -38,13 +38,13 @@ | |||
38 | cursor: pointer; | 38 | cursor: pointer; |
39 | user-select: none; | 39 | user-select: none; |
40 | 40 | ||
41 | &.selected { | ||
42 | background: #edfaff; | ||
43 | color: #2db7f5; | ||
44 | } | ||
45 | |||
46 | &:hover { | 41 | &:hover { |
47 | background: #edfaff; | 42 | background: #edfaff; |
48 | } | 43 | } |
49 | } | 44 | } |
45 | |||
46 | &-option-selected { | ||
47 | background: #edfaff; | ||
48 | color: #2db7f5; | ||
49 | } | ||
50 | } | 50 | } |