mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-07-31 20:36:35 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-3.3.0

Browse Source
This commit is contained in:
afc163 2018-02-28 10:56:45 +08:00
commit bea95bf77c
5 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/form/__tests__/__snapshots__/demo.test.js.snap
View File

@ -2503,7 +2503,7 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:0%" style="left:0%;width:0%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"

4
components/grid/__tests__/__snapshots__/demo.test.js.snap
View File

@ -480,7 +480,7 @@ exports[`renders ./components/grid/demo/playground.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:20%" style="left:0%;width:20%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -578,7 +578,7 @@ exports[`renders ./components/grid/demo/playground.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:40%" style="left:0%;width:40%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"

8
components/select/style/index.less
View File

@ -489,6 +489,14 @@
background-color: @item-hover-bg; background-color: @item-hover-bg;
} }
&:first-child {
border-radius: @border-radius-base @border-radius-base 0 0;
}
&:last-child {
border-radius: 0 0 @border-radius-base @border-radius-base;
}
&-disabled { &-disabled {
color: @disabled-color; color: @disabled-color;
cursor: not-allowed; cursor: not-allowed;

36
components/slider/__tests__/__snapshots__/demo.test.js.snap
View File

@ -10,7 +10,7 @@ exports[`renders ./components/slider/demo/basic.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:30%" style="left:0%;width:30%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -37,7 +37,7 @@ exports[`renders ./components/slider/demo/basic.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track ant-slider-track-1" class="ant-slider-track ant-slider-track-1"
style="visibility:visible;left:20%;width:30%" style="left:20%;width:30%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -88,7 +88,7 @@ exports[`renders ./components/slider/demo/event.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:30%" style="left:0%;width:30%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -115,7 +115,7 @@ exports[`renders ./components/slider/demo/event.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track ant-slider-track-1" class="ant-slider-track ant-slider-track-1"
style="visibility:visible;left:20%;width:30%" style="left:20%;width:30%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -163,7 +163,7 @@ exports[`renders ./components/slider/demo/icon-slider.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:0%" style="left:0%;width:0%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -205,7 +205,7 @@ exports[`renders ./components/slider/demo/input-number.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:0%" style="left:0%;width:0%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -293,7 +293,7 @@ exports[`renders ./components/slider/demo/input-number.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:0%" style="left:0%;width:0%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -383,7 +383,7 @@ exports[`renders ./components/slider/demo/mark.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:37%" style="left:0%;width:37%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -454,7 +454,7 @@ exports[`renders ./components/slider/demo/mark.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track ant-slider-track-1" class="ant-slider-track ant-slider-track-1"
style="visibility:visible;left:26%;width:11%" style="left:26%;width:11%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -536,10 +536,6 @@ exports[`renders ./components/slider/demo/mark.md correctly 1`] = `
<div <div
class="ant-slider-rail" class="ant-slider-rail"
/> />
<div
class="ant-slider-track"
style="visibility:hidden;left:0%;width:37%"
/>
<div <div
class="ant-slider-step" class="ant-slider-step"
> >
@ -612,7 +608,7 @@ exports[`renders ./components/slider/demo/mark.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:37%" style="left:0%;width:37%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -686,7 +682,7 @@ exports[`renders ./components/slider/demo/mark.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:37%" style="left:0%;width:37%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -762,7 +758,7 @@ exports[`renders ./components/slider/demo/tip-formatter.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:0%" style="left:0%;width:0%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -789,7 +785,7 @@ exports[`renders ./components/slider/demo/tip-formatter.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;left:0%;width:0%" style="left:0%;width:0%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -826,7 +822,7 @@ exports[`renders ./components/slider/demo/vertical.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track" class="ant-slider-track"
style="visibility:visible;bottom:0%;height:30%" style="bottom:0%;height:30%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -857,7 +853,7 @@ exports[`renders ./components/slider/demo/vertical.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track ant-slider-track-1" class="ant-slider-track ant-slider-track-1"
style="visibility:visible;bottom:20%;height:30%" style="bottom:20%;height:30%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"
@ -898,7 +894,7 @@ exports[`renders ./components/slider/demo/vertical.md correctly 1`] = `
/> />
<div <div
class="ant-slider-track ant-slider-track-1" class="ant-slider-track ant-slider-track-1"
style="visibility:visible;bottom:26%;height:11%" style="bottom:26%;height:11%"
/> />
<div <div
class="ant-slider-step" class="ant-slider-step"

2
components/timeline/style/index.less
View File

@ -63,7 +63,7 @@
border: 0; border: 0;
height: auto; height: auto;
border-radius: 0; border-radius: 0;
padding: 3px 0; padding: 3px 1px;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
top: 5px; top: 5px;
left: 5px; left: 5px;