Merge branch '1.x-stable'

This commit is contained in:
afc163 2016-07-24 13:49:42 +08:00
commit 32ab285886
8 changed files with 38 additions and 5 deletions

View File

@ -65,6 +65,12 @@ export default function createPicker(TheCalendar) {
};
let calendarHandler = {
onOk: this.handleChange,
// fix https://github.com/ant-design/ant-design/issues/1902
onSelect: (value, cause) => {
if (cause && cause.source === 'todayButton') {
this.handleChange(value);
}
},
};
if (props.showTime) {
pickerChangeHandler = {};

View File

@ -266,6 +266,9 @@
.@{calendar-prefix-cls}-clear-btn:after {
content: "\e631";
font-family: "anticon";
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 12px;
color: #ccc;
display: inline-block;

View File

@ -280,6 +280,9 @@ form {
text-align: center;
font-size: 14px;
animation: zoomIn .3s @ease-out-back;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
}

View File

@ -29,6 +29,9 @@
display: block;
font-family: "anticon" !important;
content: "\E631";
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
&:hover {
color: #999;

View File

@ -32,11 +32,15 @@
height: 18px;
left: 2px;
top: 1px;
border-radius: 100%;
border-radius: 18px;
background-color: #fff;
content: " ";
cursor: pointer;
transition: left @switch-duration @ease-in-out-circ;
transition: left @switch-duration @ease-in-out-circ, width @switch-duration @ease-in-out-circ;
}
&:active:after {
width: 24px;
}
&:focus {
@ -58,12 +62,19 @@
top: 0;
left: 0;
}
&:active:after {
width: 16px;
}
}
&-small&-checked:after {
left: 14px;
}
&-small:active&-checked:after {
left: 10px;
}
&-checked {
border-color: @primary-color;
background-color: @primary-color;
@ -75,6 +86,10 @@
&:after {
left: 22px;
}
&:active:after {
left: 16px;
}
}
&-disabled {

View File

@ -69,6 +69,9 @@
line-height: 1;
width: 20px;
transition: color 0.3s ease;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
&-clear-btn:hover:after {

View File

@ -84,7 +84,7 @@ english: 三大特性
### 通俗而科学的设计原则
详见[『十大原则』](./principle)。
详见[『十大原则』](/docs/spec/principle)。
---

View File

@ -20,7 +20,7 @@
}
.resource-card:hover {
box-shadow: 0 1px 4px rgba(64,64,64,.2);
box-shadow: 0 1px 6px rgba(100, 100, 100, .2);
}
.resource-card:hover .resource-card-title {
@ -66,4 +66,4 @@
display: block;
color: #999;
padding-right: 8px;
}
}