test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-04 04:58:55 +08:00
Code Issues Actions 100 Packages Projects Releases Wiki Activity

Merge branch 'master' into antd-3.0

Browse Source
This commit is contained in:
afc163 2017-08-10 16:32:37 +08:00
commit d324b28e1a
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

3
components/form/style/index.less
View File

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

6
components/table/style/index.less
View File

@ -627,6 +627,12 @@
margin-bottom: -20px; 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-left,
&-fixed-right { &-fixed-right {
position: absolute; position: absolute;

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

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