mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-08-06 07:56:28 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge pull request #24199 from ant-design/master

Browse Source 
chore: Feature merge master
This commit is contained in:
二货机器人 2020-05-16 12:30:58 +08:00 committed by GitHub
commit 7de007100d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/_util/scrollTo.ts
View File

@ -24,8 +24,8 @@ export default function scrollTo(y: number, options: ScrollToOptions = {}) {
const nextScrollTop = easeInOutCubic(time > duration ? duration : time, scrollTop, y, duration); const nextScrollTop = easeInOutCubic(time > duration ? duration : time, scrollTop, y, duration);
if (isWindow(container)) { if (isWindow(container)) {
(container as Window).scrollTo(window.pageXOffset, nextScrollTop); (container as Window).scrollTo(window.pageXOffset, nextScrollTop);
} else if (container instanceof Document) { } else if (container instanceof HTMLDocument || container.constructor.name === 'HTMLDocument') {
container.documentElement.scrollTop = nextScrollTop; (container as HTMLDocument).documentElement.scrollTop = nextScrollTop;
} else { } else {
(container as HTMLElement).scrollTop = nextScrollTop; (container as HTMLElement).scrollTop = nextScrollTop;
} }

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

@ -76,7 +76,7 @@
// https://stackoverflow.com/a/22429853/3040605 // https://stackoverflow.com/a/22429853/3040605
margin-left: auto; margin-left: auto;
padding: @card-head-padding 0; padding: @card-head-padding 0;
color: @text-color; color: @card-head-extra-color;
font-weight: normal; font-weight: normal;
font-size: @font-size-base; font-size: @font-size-base;

3
components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap
View File

@ -587,7 +587,8 @@ Array [
class="ant-picker-footer" class="ant-picker-footer"
> >
<a <a
class="ant-picker-today-btn" aria-disabled="true"
class="ant-picker-today-btn ant-picker-today-btn-disabled"
> >
Today Today
</a> </a>

5
components/date-picker/style/panel.less
View File

@ -436,6 +436,11 @@
&:active { &:active {
color: @link-active-color; color: @link-active-color;
} }
&&-disabled {
color: @disabled-color;
cursor: not-allowed;
}
} }
// ======================================================== // ========================================================

1
components/style/themes/default.less
View File

@ -660,6 +660,7 @@
0 5px 12px 4px rgba(0, 0, 0, 0.09); 0 5px 12px 4px rgba(0, 0, 0, 0.09);
@card-radius: @border-radius-base; @card-radius: @border-radius-base;
@card-head-tabs-margin-bottom: -17px; @card-head-tabs-margin-bottom: -17px;
@card-head-extra-color: @text-color;
// Comment // Comment
// --- // ---

2
package.json
View File

@ -127,7 +127,7 @@
"rc-menu": "~8.1.0", "rc-menu": "~8.1.0",
"rc-notification": "~4.3.0", "rc-notification": "~4.3.0",
"rc-pagination": "~2.2.0", "rc-pagination": "~2.2.0",
"rc-picker": "~1.4.0", "rc-picker": "~1.4.16",
"rc-progress": "~3.0.0", "rc-progress": "~3.0.0",
"rc-rate": "~2.6.0", "rc-rate": "~2.6.0",
"rc-resize-observer": "^0.2.0", "rc-resize-observer": "^0.2.0",