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.

Sign up for GitHub

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

Jump to bottom

fix(Form): label width not correct when screen less than xs #21222

Merged
merged 3 commits into from
Feb 12, 2020
Merged

fix(Form): label width not correct when screen less than xs #21222

merged 3 commits into from
Feb 12, 2020

Conversation

shaodahong
Copy link
Member

@shaodahong shaodahong commented Feb 4, 2020 •
edited
Loading

🤔 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

Ref: #20836 (comment)

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English
🇨🇳 Chinese

☑️ 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

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Feb 4, 2020 •
edited
Loading

@shaodahong
Copy link
Member Author

/rebase

@afc163
Copy link
Member

afc163 commented Feb 4, 2020

当前仓库分支 /rebase 才会生效。

@codesandbox-ci
Copy link

codesandbox-ci bot commented Feb 4, 2020 •
edited
Loading

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

Sandbox Source
antd reproduction template Configuration

@codecov
Copy link

codecov bot commented Feb 4, 2020 •
edited
Loading

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #21222   +/-   ##
=======================================
  Coverage   97.55%   97.55%           
=======================================
  Files         300      300           
  Lines        7003     7003           
  Branches     1932     1920   -12     
=======================================
  Hits         6832     6832           
  Misses        171      171

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 7eb4852...abfbd98. Read the comment docs.

@zombieJ
Copy link
Member

zombieJ commented Feb 8, 2020

不应该直接 100%，用户设置了 col 的时候应该按照设置的来：

截屏2020-02-08上午11 42 19

截屏2020-02-08上午11 42 43

ref: https://preview-21222-ant-design.surge.sh/components/form-cn/#components-form-demo-basic

@shaodahong
Copy link
Member Author

不应该直接 100%，用户设置了 col 的时候应该按照设置的来：

截屏2020-02-08上午11 42 19 截屏2020-02-08上午11 42 43

ref: https://preview-21222-ant-design.surge.sh/components/form-cn/#components-form-demo-basic

以前的逻辑就是 XS 下 label 独占一行，不过以前是通过 display:block 来控制的

@shaodahong
Copy link
Member Author

shaodahong commented Feb 8, 2020 •
edited
Loading

3.0 的版本

image

@zombieJ
Copy link
Member

zombieJ commented Feb 10, 2020

Get 了，那下面的应该也撑满：
截屏2020-02-10上午10 32 25

@shaodahong
Copy link
Member Author

Done.

@zombieJ
Copy link
Member

zombieJ commented Feb 11, 2020

截屏2020-02-11下午5 16 54

Preview seems no effect.

@zombieJ zombieJ merged commit e01755c into ant-design:master Feb 12, 2020
@shaodahong shaodahong deleted the fix-less-than-xs-form-label-width branch February 12, 2020 02:51
orkhan-huseyn pushed a commit to orkhan-huseyn/ant-design that referenced this pull request Feb 12, 2020
@shaodahong @orkhan-huseyn
fix(Form): label width not correct when screen less than xs (ant-desi…
733aff9 
…gn#21222)

* fix(Form): label width not correct when screen less than xs

* fix form item control width

* fix css selector priority
yoyo837 pushed a commit that referenced this pull request Feb 15, 2020
@orkhan-huseyn @ElliotAshby @shaodahong
feat: Azerbaijani translation (#21387)
28a5292 
* add Azerbaijani translation

* fix: rename Azerbaijani translation file

* fix: add az_AZ.txs file into locale/ folder

* fix: linting error on tranling comma

* fix: duplicate locales in locale-provide, a typo

* #21343 - fix (#21344)

* fix(Form): label width not correct when screen less than xs (#21222)

* fix(Form): label width not correct when screen less than xs

* fix form item control width

* fix css selector priority

* fix: separate translation into multiple files for Azerbaijani locale

* fix: wrong import from tr_TR locales into az_AZ

* fix: typo in calendar locale az

* add Azerbaijani translation

* fix: rename Azerbaijani translation file

* fix: add az_AZ.txs file into locale/ folder

* fix: linting error on tranling comma

* fix: duplicate locales in locale-provide, a typo

* add: time picker az_AZ locale

* fix: separate translation into multiple files for Azerbaijani locale

* fix: wrong import from tr_TR locales into az_AZ

* fix: typo in calendar locale az

* update: rc-picker in package.json

Co-authored-by: ElliotAshby <47282526+ElliotAshby@users.noreply.github.com>
Co-authored-by: 骗你是小猫咪 <darryshaw@gmail.com>
@chenshuai2144 chenshuai2144 mentioned this pull request Feb 16, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@shaodahong @ant-design-bot @afc163 @zombieJ