Browse Source

Merge branch 'master' into feature

* master:
  Fixed Modal width when screen size smaller than 768px
  🚨 coverage precision to 1
  🚨 update .codecov.yml
  💄 Fix Badge animation jump when count is ReactNode
  fix Popover arrow narrow line at top
  fix Popover arrow border in different directions
  fix popover arrow top shadow
  Change render of + & - icon fix #13924
  🐛 loose button type propTypes for custom usage
  fix input has min size close #3699
  fix: fix-picture-spell-error
pull/13776/head
afc163 6 years ago
parent
commit
8b5e78f174
No known key found for this signature in database GPG Key ID: 738F973FCE5C6B48
  1. 4
      .codecov.yml
  2. 17
      components/badge/style/index.less
  3. 2
      components/button/button.tsx
  4. 9
      components/button/style/index.less
  5. 4
      components/modal/style/modal.less
  6. 23
      components/popover/style/index.less
  7. 1
      components/radio/style/index.less
  8. 10
      components/upload/style/index.less

4
.codecov.yml

@ -1,2 +1,6 @@
codecov:
branch: master
coverage:
precision: 1
round: down

17
components/badge/style/index.less

@ -12,7 +12,6 @@
color: unset;
&-count {
top: -@badge-height / 2;
height: @badge-height;
border-radius: @badge-height / 2;
min-width: @badge-height;
@ -37,7 +36,6 @@
}
&-dot {
top: -@badge-dot-size / 2;
height: @badge-dot-size;
width: @badge-dot-size;
border-radius: 100%;
@ -51,12 +49,9 @@
.@{number-prefix-cls}-custom-component {
position: absolute;
right: 0;
transform: translateX(50%);
transform-origin: 100%;
}
.@{number-prefix-cls}-custom-component {
top: 0;
transform: translate(50%, -50%);
transform-origin: 100% 0%;
}
&-status {
@ -159,19 +154,19 @@
@keyframes antZoomBadgeIn {
0% {
opacity: 0;
transform: scale(0) translateX(50%);
transform: scale(0) translate(50%, -50%);
}
100% {
transform: scale(1) translateX(50%);
transform: scale(1) translate(50%, -50%);
}
}
@keyframes antZoomBadgeOut {
0% {
transform: scale(1) translateX(50%);
transform: scale(1) translate(50%, -50%);
}
100% {
opacity: 0;
transform: scale(0) translateX(50%);
transform: scale(0) translate(50%, -50%);
}
}

2
components/button/button.tsx

@ -87,7 +87,7 @@ export default class Button extends React.Component<ButtonProps, any> {
};
static propTypes = {
type: PropTypes.oneOf(ButtonTypes),
type: PropTypes.string,
shape: PropTypes.oneOf(ButtonShapes),
size: PropTypes.oneOf(ButtonSizes),
htmlType: PropTypes.oneOf(ButtonHTMLTypes),

9
components/button/style/index.less

@ -92,6 +92,15 @@
.@{iconfont-css-prefix} {
transition: margin-left 0.3s @ease-in-out;
// Follow icon blur under windows. Change the render.
// https://github.com/ant-design/ant-design/issues/13924
&.@{iconfont-css-prefix}-plus,
&.@{iconfont-css-prefix}-minus {
> svg {
shape-rendering: optimizeSpeed;
}
}
}
&&-loading:before {

4
components/modal/style/modal.less

@ -148,8 +148,8 @@
@media (max-width: @screen-sm-max) {
.@{dialog-prefix-cls} {
width: auto !important;
margin: 10px;
max-width: calc(100vw - 16px);
margin: 8px;
}
.@{dialog-prefix-cls}-centered {
.@{dialog-prefix-cls} {

23
components/popover/style/index.less

@ -100,22 +100,25 @@
// .popover-arrow is outer, .popover-arrow:after is inner
&-arrow {
background: @popover-bg;
background-color: inherit;
background: transparent;
width: sqrt(@popover-arrow-width * @popover-arrow-width * 2);
height: sqrt(@popover-arrow-width * @popover-arrow-width * 2);
transform: rotate(45deg);
position: absolute;
display: block;
border-color: transparent;
border-width: sqrt(@popover-arrow-width * @popover-arrow-width * 2) / 2;
border-style: solid;
}
&-placement-top > &-content > &-arrow,
&-placement-topLeft > &-content > &-arrow,
&-placement-topRight > &-content > &-arrow {
bottom: @popover-distance - @popover-arrow-width + 1.5px;
bottom: @popover-distance - @popover-arrow-width + 2.2px;
box-shadow: 3px 3px 7px fade(@black, 7%);
border-top-color: transparent;
border-right-color: @popover-bg;
border-bottom-color: @popover-bg;
border-left-color: transparent;
}
&-placement-top > &-content > &-arrow {
left: 50%;
@ -133,6 +136,10 @@
&-placement-rightBottom > &-content > &-arrow {
left: @popover-distance - @popover-arrow-width + 2px;
box-shadow: -3px 3px 7px fade(@black, 7%);
border-top-color: transparent;
border-right-color: transparent;
border-bottom-color: @popover-bg;
border-left-color: @popover-bg;
}
&-placement-right > &-content > &-arrow {
top: 50%;
@ -150,6 +157,10 @@
&-placement-bottomRight > &-content > &-arrow {
top: @popover-distance - @popover-arrow-width + 2px;
box-shadow: -2px -2px 5px fade(@black, 6%);
border-top-color: @popover-bg;
border-right-color: transparent;
border-bottom-color: transparent;
border-left-color: @popover-bg;
}
&-placement-bottom > &-content > &-arrow {
left: 50%;
@ -167,6 +178,10 @@
&-placement-leftBottom > &-content > &-arrow {
right: @popover-distance - @popover-arrow-width + 2px;
box-shadow: 3px -3px 7px fade(@black, 7%);
border-top-color: @popover-bg;
border-right-color: @popover-bg;
border-bottom-color: transparent;
border-left-color: transparent;
}
&-placement-left > &-content > &-arrow {
top: 50%;

1
components/radio/style/index.less

@ -214,6 +214,7 @@ span.@{radio-prefix-cls} + * {
opacity: 0;
width: 0;
height: 0;
pointer-events: none;
}
&-checked {

10
components/upload/style/index.less

@ -3,7 +3,7 @@
@upload-prefix-cls: ~'@{ant-prefix}-upload';
@upload-item: ~'@{ant-prefix}-upload-list-item';
@upload-pictrue-card-size: 104px;
@upload-picture-card-size: 104px;
@upload-picture-card-border-style: @border-style-base;
.@{upload-prefix-cls} {
@ -30,8 +30,8 @@
&&-select-picture-card {
border: @border-width-base dashed @border-color-base;
width: @upload-pictrue-card-size;
height: @upload-pictrue-card-size;
width: @upload-picture-card-size;
height: @upload-picture-card-size;
border-radius: @border-radius-base;
background-color: @background-color-light;
text-align: center;
@ -300,8 +300,8 @@
}
.@{upload-item} {
float: left;
width: @upload-pictrue-card-size;
height: @upload-pictrue-card-size;
width: @upload-picture-card-size;
height: @upload-picture-card-size;
margin: 0 8px 8px 0;
}

Loading…
Cancel
Save