Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tweak: DatePicker styling #20736

Merged
merged 7 commits into from Jan 9, 2020
Merged

tweak: DatePicker styling #20736

merged 7 commits into from Jan 9, 2020

Conversation

ycjcl868
Copy link
Member

@ycjcl868 ycjcl868 commented Jan 7, 2020

Close #20726.

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

📝 Changelog

🇺🇸English:
-DatePicker
   -💄 Optimize the border-radius of the connection and change it to rounded corners.
   -🐞 Fix selected style overlap
   -🐞 Fix extra dividing line at the bottom
   -🌟 Added @picker-basic-cell-active-with-range-color and @picker-date-hover-range-color two Less variables

🇨🇳 Chinese:

  • DatePicker
    • 💄 优化连接处 border-radius,改成圆角。
    • 🐞 修复选中样式重叠
    • 🐞 修复底部额外分割线
    • 🌟 增加 @picker-basic-cell-active-with-range-color@picker-date-hover-range-color 两个 Less 变量

☑️ Self Check before Merge

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@auto-add-label auto-add-label bot added the tweak label Jan 7, 2020
@netlify
Copy link

@netlify netlify bot commented Jan 7, 2020

Deploy preview for ant-design ready!

Built with commit b546215

https://deploy-preview-20736--ant-design.netlify.com

@@ -229,6 +229,14 @@
background: @primary-color;
}

&-in-view&-range-start:not(&-range-end) .@{cellClassName} {
border-radius: 2px 0 0 2px;
Copy link
Member

@afc163 afc163 Jan 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

应该用变量。

@ycjcl868 ycjcl868 changed the title [WIP] tweak: picker start and end border-radius tweak: picker start and end border-radius Jan 8, 2020
@afc163
Copy link
Member

@afc163 afc163 commented Jan 8, 2020

This PR will not close #20726

@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Jan 8, 2020

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 8d3637c:

Sandbox Source
antd reproduction template Configuration

@afc163 afc163 removed the tweak label Jan 8, 2020
@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Jan 8, 2020

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 b546215:

Sandbox Source
antd reproduction template Configuration

@ycjcl868 ycjcl868 added the 4.x label Jan 8, 2020
@ycjcl868 ycjcl868 changed the title tweak: picker start and end border-radius fix: DatePicker styling Jan 8, 2020
@auto-add-label auto-add-label bot added the bug label Jan 8, 2020
@ycjcl868 ycjcl868 changed the title fix: DatePicker styling tweak: DatePicker styling Jan 8, 2020
@auto-add-label auto-add-label bot added tweak and removed bug labels Jan 8, 2020
@ycjcl868 ycjcl868 removed the tweak label Jan 8, 2020
@@ -12,7 +12,6 @@
display: inline-block;
text-align: center;
background: @calendar-bg;
border: @border-width-base @border-style-base @picker-border-color;
Copy link
Member

@afc163 afc163 Jan 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

这里的边框没了。

@codecov
Copy link

@codecov codecov bot commented Jan 8, 2020

Codecov Report

Merging #20736 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #20736      +/-   ##
==========================================
+ Coverage   97.46%   97.47%   +<.01%     
==========================================
  Files         296      296              
  Lines        6877     6878       +1     
  Branches     1865     1865              
==========================================
+ Hits         6703     6704       +1     
  Misses        174      174
Impacted Files Coverage Δ
components/input/ClearableLabeledInput.tsx 100% <ø> (ø) ⬆️
components/carousel/index.tsx 100% <100%> (ø) ⬆️
components/input/Input.tsx 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3580b7b...b546215. Read the comment docs.

@afc163
Copy link
Member

@afc163 afc163 commented Jan 8, 2020

多余的边框还在

图片

@ycjcl868
Copy link
Member Author

@ycjcl868 ycjcl868 commented Jan 9, 2020

@zombieJ cc, footer 没内容时 className 还在,PR react-component/picker#19

image

@ycjcl868
Copy link
Member Author

@ycjcl868 ycjcl868 commented Jan 9, 2020

ci 过了就可以合了

@zombieJ zombieJ merged commit da64b8b into master Jan 9, 2020
32 checks passed
@zombieJ zombieJ deleted the fix-picker-style branch Jan 9, 2020
@pr-triage pr-triage bot added the PR: merged label Jan 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants