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

adjust slider text style #15128

Merged
merged 3 commits into from Apr 28, 2019
Merged

adjust slider text style #15128

merged 3 commits into from Apr 28, 2019

Conversation

@zombieJ
Copy link
Member

@zombieJ zombieJ commented Mar 1, 2019

First of all, thank you for your contribution! 😄

New feature please send pull request to feature branch, and rest to master branch.
Pull request will be merged after one of collaborators approve.
Please makes sure that these form are filled before submitting your pull request, thank you!

[中文版模板 / Chinese template]

This is a ...

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

What's the background?

fix #15127

Changelog description (Optional if not new feature)

  1. Fix Slider mark text style will break line.
  2. 修复 Slider 的文字会换行的问题。

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
@zombieJ zombieJ requested review from afc163 and ztplz Mar 1, 2019
@afc163
Copy link
Member

@afc163 afc163 commented Mar 1, 2019

万一就是要换行呢

@codecov
Copy link

@codecov codecov bot commented Mar 1, 2019

Codecov Report

Merging #15128 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #15128   +/-   ##
=======================================
  Coverage   92.78%   92.78%           
=======================================
  Files         237      237           
  Lines        6261     6261           
  Branches     1838     1838           
=======================================
  Hits         5809     5809           
  Misses        451      451           
  Partials        1        1

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 e26c513...dae5467. Read the comment docs.

@netlify
Copy link

@netlify netlify bot commented Mar 1, 2019

Deploy preview for ant-design failed.

Built with commit 73aaf0a

https://app.netlify.com/sites/ant-design/deploys/5cc554968642b60008f8dd29

@codecov
Copy link

@codecov codecov bot commented Mar 1, 2019

Codecov Report

Merging #15128 into master will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #15128      +/-   ##
==========================================
+ Coverage   95.28%   95.32%   +0.04%     
==========================================
  Files         253      253              
  Lines        6780     6780              
  Branches     1970     1933      -37     
==========================================
+ Hits         6460     6463       +3     
+ Misses        319      316       -3     
  Partials        1        1
Impacted Files Coverage Δ
components/_util/wave.tsx 88.46% <0%> (+2.88%) ⬆️

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 61f7003...73aaf0a. Read the comment docs.

@zombieJ
Copy link
Member Author

@zombieJ zombieJ commented Mar 1, 2019

万一就是要换行呢

那直接 revert 掉这个如何? react-component/slider@060d8c6#diff-7c429cf3d38f312b214ce1b8b3828528

@zombieJ zombieJ merged commit 5469bba into master Apr 28, 2019
24 of 30 checks passed
@pr-triage pr-triage bot added the PR: merged label Apr 28, 2019
@delete-merged-branch delete-merged-branch bot deleted the slider-mark branch Apr 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants