mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-08-06 16:06:28 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

continue to fix #3312 & #3307

Browse Source
This commit is contained in:
afc163 2016-10-07 16:04:11 +08:00
parent f1d0223b66
commit 1566011720
2 changed files with 34 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/date-picker/style/RangePicker.less
View File

@ -91,7 +91,7 @@
border-radius: @border-radius-sm; border-radius: @border-radius-sm;
} }
.@{calendar-prefix-cls}-input, .@{calendar-prefix-cls}-input,
.@{timepicker-prefix-cls}-input { .@{calendar-timepicker-prefix-cls}-input {
.input; .input;
border-radius: @border-radius-sm; border-radius: @border-radius-sm;
height: @input-height-sm; height: @input-height-sm;
@ -102,7 +102,7 @@
box-shadow: none; box-shadow: none;
} }
} }
.@{timepicker-prefix-cls}-icon { .@{calendar-timepicker-prefix-cls}-icon {
display: none; display: none;
} }
@ -164,7 +164,7 @@
} }
&.@{calendar-prefix-cls}-time { &.@{calendar-prefix-cls}-time {
.@{timepicker-prefix-cls} { .@{calendar-timepicker-prefix-cls} {
height: 207px; height: 207px;
top: 68px; top: 68px;
z-index: 2; // cover .ant-calendar-range .ant-calendar-in-range-cell > div (z-index: 1) z-index: 2; // cover .ant-calendar-range .ant-calendar-in-range-cell > div (z-index: 1)

184
components/date-picker/style/TimePicker.less
View File

@ -2,7 +2,7 @@
position: absolute; position: absolute;
width: 100%; width: 100%;
top: 34px; top: 34px;
background-color: white; background-color: #fff;
height: 206px; height: 206px;
&-panel { &-panel {
@ -39,58 +39,8 @@
} }
} }
&-input { &-input-wrap {
margin: 0; display: none;
padding: 0;
border: 0;
width: 100%;
cursor: auto;
line-height: 1.5;
outline: 0;
&-wrap {
display: none;
box-sizing: border-box;
position: relative;
padding: 6px;
border-bottom: 1px solid @border-color-split;
}
&-invalid {
border-color: red;
}
}
&-clear-btn {
position: absolute;
right: 5px;
cursor: pointer;
overflow: hidden;
width: 20px;
height: 20px;
text-align: center;
line-height: 20px;
top: 5px;
margin: 0;
}
&-clear-btn:after {
content: "\e62e";
font-family: "anticon";
font-size: 12px;
color: #ccc;
display: inline-block;
line-height: 1;
width: 20px;
transition: color 0.3s ease;
}
&-clear-btn:hover:after {
color: #999;
}
&-narrow &-input-wrap {
max-width: 111px;
} }
&-select { &-select {
@ -162,115 +112,43 @@
} }
} }
} }
&.slide-up-enter.slide-up-enter-active&-placement-topLeft,
&.slide-up-enter.slide-up-enter-active&-placement-topRight,
&.slide-up-appear.slide-up-appear-active&-placement-topLeft,
&.slide-up-appear.slide-up-appear-active&-placement-topRight {
animation-name: antSlideDownIn;
}
&.slide-up-enter.slide-up-enter-active&-placement-bottomLeft,
&.slide-up-enter.slide-up-enter-active&-placement-bottomRight,
&.slide-up-appear.slide-up-appear-active&-placement-bottomLeft,
&.slide-up-appear.slide-up-appear-active&-placement-bottomRight {
animation-name: antSlideUpIn;
}
&.slide-up-leave.slide-up-leave-active&-placement-topLeft,
&.slide-up-leave.slide-up-leave-active&-placement-topRight {
animation-name: antSlideDownOut;
}
&.slide-up-leave.slide-up-leave-active&-placement-bottomLeft,
&.slide-up-leave.slide-up-leave-active&-placement-bottomRight {
animation-name: antSlideUpOut;
}
} }
.@{timepicker-prefix-cls} { .@{calendar-prefix-cls}-time {
display: inline-block; .@{calendar-prefix-cls}-day-select {
outline: none; padding: 0 2px;
font-size: @font-size-base; font-weight: bold;
display: inline-block;
&-input { color: #666;
.input; line-height: 34px;
width: 100px;
} }
&-large &-input { .@{calendar-prefix-cls}-footer {
.input-lg; border-top: 1px solid @border-color-split;
} padding: 10px 0;
text-align: right;
position: relative;
height: auto;
line-height: auto;
&-small &-input { &-btn {
.input-sm; line-height: 1.5;
}
&-open {
opacity: 0;
}
&-icon {
position: absolute;
user-select: none;
transition: all .3s @ease-in-out;
width: 12px;
height: 12px;
line-height: 12px;
right: 8px;
color: #999;
top: 50%;
margin-top: -6px;
&:after {
content: "\e643";
font-family: "anticon";
font-size: 12px;
color: #999;
display: inline-block;
line-height: 1;
vertical-align: bottom;
}
}
}
.@{calendar-prefix-cls} {
&-time {
.@{calendar-prefix-cls}-day-select {
padding: 0 2px;
font-weight: bold;
display: inline-block;
color: #666;
line-height: 34px;
}
.@{calendar-prefix-cls}-footer {
border-top: 1px solid @border-color-split;
padding: 10px 0;
text-align: right; text-align: right;
position: relative; }
height: auto;
line-height: auto;
&-btn { .@{calendar-prefix-cls}-today-btn {
line-height: 1.5; float: left;
text-align: right; margin: 0;
} padding-left: 12px;
}
.@{calendar-prefix-cls}-today-btn { .@{calendar-prefix-cls}-time-picker-btn {
float: left; display: inline-block;
margin: 0; text-align: center;
padding-left: 12px; margin-right: 60px;
}
.@{calendar-prefix-cls}-time-picker-btn { &-disabled {
display: inline-block; color: #ccc;
text-align: center;
margin-right: 60px;
&-disabled {
color: #ccc;
}
} }
} }
} }