chore: merge master into feature #27275
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…0.0 (#27126) Bumps [remark-preset-lint-recommended](https://github.com/remarkjs/remark-lint) from 4.0.1 to 5.0.0. - [Release notes](https://github.com/remarkjs/remark-lint/releases) - [Changelog](https://github.com/remarkjs/remark-lint/blob/main/changelog.md) - [Commits](https://github.com/remarkjs/remark-lint/compare/4.0.1...remark-preset-lint-recommended@5.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* style: fix Typography Link color * Update index.less
* chore: use @border-width-base * fix: Divider color with text close #27132
* refactor: some styles to reduce css bundle size * test: update snapshot * fix snapshot * fix test case * fix addonAfter * fix firefox style * reduce riddon css size * fix Input.Group border radius * remove unused css selectors * fix test cov * fix search button hover border * fix rtl textarea clear icon style * update demos * fix search rtl style * fix input search style
* test: ✅ fix modal test cases * 🆙 upgrade remark-lint
* refactor(result): useContext and improve code * Update index.tsx * Update index.tsx
* feat: Add block & pre style * fix lint
…d-width (#27154) * fix: collapsedWidth do not work on Sider * fix test case * fix test case * fix extra trigger div * fix lint
* fix: if form warp drawer, close button will trigger submit * update snapshot
* fix: add optional rules property * fix: replace interface
* improve: useCombinedRefs code * change location
* docs(button): improve docs * Update index.less
* fix: add styling form input background-color * fix: conflict resolution Co-authored-by: Maksimova, Yuliya <Yuliya.Maksimova@nexign.com>
* docs: fix invalid disabledDate of RangePicker demo Close #26885 * Update select-in-range.md Co-authored-by: 偏右 <afc163@gmail.com>
* chore: improve sort api table scripts * sort api * add ignore * Revert "sort api" This reverts commit 343505d. * sort api * Update package.json * sort api * Delete sort-api.js * sort api * sort api * sort api * fix * Update index.zh-CN.md * fix input-number * fix input-number * sort func * fix * Method moved to the end * carousel method
|
看下 我 解决的 冲突 对不对 😂 |
|
冲突的文件列出来，单独看看。 |
|
|
|
|
|
|
|
Size Change: +758 B (0%) Total Size: 792 kB
|
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. Latest deployment of this branch, based on commit 4cd2cfa:
|
Codecov Report
@@ Coverage Diff @@
## feature #27275 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 388 389 +1
Lines 7396 7393 -3
Branches 2072 2079 +7
=========================================
- Hits 7396 7393 -3
Continue to review full report at Codecov.
|
xrkffgg
approved these changes
Oct 21, 2020
yoyo837
approved these changes
Oct 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[中文版模板 / Chinese template]
🤔 This is a ...
🔗 Related issue link
💡 Background and solution
📝 Changelog
☑️ Self Check before Merge
View rendered components/config-provider/demo/size.md
View rendered components/image/index.en-US.md
View rendered components/image/index.zh-CN.md