Browse Source

Merge branch 'master' into antd-3.0

pull/7178/head
afc163 7 years ago
parent
commit
d324b28e1a
  1. 2
      components/date-picker/style/Picker.less
  2. 2
      components/date-picker/style/RangePicker.less
  3. 3
      components/form/style/index.less
  4. 6
      components/table/style/index.less
  5. 2
      docs/react/recommendation.zh-CN.md

2
components/date-picker/style/Picker.less

@ -36,7 +36,7 @@
&-input {
outline: none;
vertical-align: top;
display: block;
}
&:hover &-input:not(.@{ant-prefix}-input-disabled) {

2
components/date-picker/style/RangePicker.less

@ -3,7 +3,7 @@
.@{calendar-prefix-cls}-range-picker-input {
background-color: transparent;
border: 0;
height: 100%;
height: 99%;
outline: 0;
width: 43%;
text-align: center;

3
components/form/style/index.less

@ -7,6 +7,7 @@
@form-prefix-cls: ~"@{ant-prefix}-form";
@form-component-height: @input-height-lg;
@form-feedback-icon-size: 14px;
.reset-form();
@ -361,7 +362,7 @@ form {
.square(@input-height-lg);
line-height: @input-height-lg;
text-align: center;
font-size: @font-size-lg;
font-size: @form-feedback-icon-size;
animation: zoomIn .3s @ease-out-back;
.iconfont-font("");
z-index: 1;

6
components/table/style/index.less

@ -627,6 +627,12 @@
margin-bottom: -20px;
}
// Ignore the scroll.x width
// https://github.com/ant-design/ant-design/issues/7142
&-empty &-scroll &-body &-fixed {
width: auto !important;
}
&-fixed-left,
&-fixed-right {
position: absolute;

2
docs/react/recommendation.zh-CN.md

@ -23,7 +23,7 @@ title: 社区精选组件
应用国际化 | [react-intl](https://github.com/yahoo/react-intl)
代码高亮 | [react-syntax-highlighter](https://github.com/conorhastings/react-syntax-highlighter)
Markdown 渲染 | [react-markdown](http://rexxars.github.io/react-markdown/)
无限滚动 | [react-virtualized](https://devarchy.com/react/react-virtualized)
无限滚动 | [react-virtualized](https://github.com/bvaughn/react-virtualized)
<style>
.markdown table td:first-child {

Loading…
Cancel
Save