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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(theme): adjust font-size in compact mode #23135

Merged
merged 12 commits into from Apr 28, 2020
Merged

Conversation

AshoneA
Copy link
Contributor

@AshoneA AshoneA commented Apr 10, 2020

Closes #23015

馃 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

Closes #23015

馃挕 Background and solution

With compact theme mode, we adjust default font-size from 14px to 12px.

馃摑 Changelog

Language Changelog
馃嚭馃嚫 English adjust font-size in compact mode
馃嚚馃嚦 Chinese 璋冩暣绱у噾妯″紡涓嬮粯璁ょ殑瀛椾綋澶у皬

鈽戯笍 Self Check before Merge

鈿狅笍 Please check all items below before review. 鈿狅笍

  • 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 Apr 10, 2020

@afc163
Copy link
Member

afc163 commented Apr 11, 2020

feature branch

With compact theme mode, we adjust default font-size from 14px to 12px.

Closes #23015
@AshoneA AshoneA changed the base branch from master to feature Apr 12, 2020
@AshoneA AshoneA force-pushed the feat/compact-small-font branch from 9e5e94f to de97b3e Compare Apr 12, 2020
@AshoneA AshoneA requested a review from zombieJ as a code owner Apr 12, 2020
@AshoneA AshoneA removed the request for review from zombieJ Apr 12, 2020
@codesandbox-ci
Copy link

codesandbox-ci bot commented Apr 13, 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 b9d6a29:

Sandbox Source
antd reproduction template Configuration

@codecov
Copy link

codecov bot commented Apr 13, 2020

Codecov Report

Merging #23135 into feature will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #23135      +/-   ##
===========================================
- Coverage    98.50%   98.50%   -0.01%     
===========================================
  Files          363      363              
  Lines         7237     7236       -1     
  Branches      1966     2004      +38     
===========================================
- Hits          7129     7128       -1     
  Misses         108      108              
Impacted Files Coverage 螖
components/table/hooks/useSelection.tsx 98.31% <酶> (-0.01%) 猬囷笍

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 a534e4a...b9d6a29. Read the comment docs.

@@ -113,7 +113,7 @@

&-with-description &-icon {
position: absolute;
top: 16px;
top: @alert-icon-top;
Copy link
Member

@afc163 afc163 Apr 21, 2020

Choose a reason for hiding this comment

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

杩欎釜鍊兼渶濂借兘鏍规嵁鏍囬澶у皬鍜 alert padding top 绠楀嚭鏉ャ

@@ -854,6 +855,7 @@
@alert-with-description-padding: @padding-md - 1px 15px @padding-md - 1px 64px;
@alert-icon-top: 8px + @font-size-base * @line-height-base / 2 - @font-size-base / 2;
@alert-with-description-icon-size: 24px;
@alert-with-description-icon-top: @padding-md;
Copy link
Member

@afc163 afc163 Apr 24, 2020

Choose a reason for hiding this comment

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

杩欎釜 top 搴旇鏄彲浠ユ牴鎹 @alert-with-description-padding 绠楀嚭鏉ワ紵

Copy link
Contributor Author

@AshoneA AshoneA Apr 24, 2020

Choose a reason for hiding this comment

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

搴旇鐩存帴鐢ㄥ瀭鐩存柟鍚戜笂鐨 padding 灏卞ソ浜嗐

@AshoneA AshoneA force-pushed the feat/compact-small-font branch from 7616119 to 52862af Compare Apr 27, 2020
@zombieJ zombieJ changed the title [WIP] feat(theme): adjust font-size in compact mode feat(theme): adjust font-size in compact mode Apr 28, 2020
@zombieJ zombieJ merged commit 14417f1 into feature Apr 28, 2020
33 checks passed
@zombieJ zombieJ deleted the feat/compact-small-font branch Apr 28, 2020
@AshoneA AshoneA mentioned this pull request Apr 28, 2020
54 tasks
@xrkffgg xrkffgg mentioned this pull request Apr 30, 2020
14 tasks
@yunsii
Copy link

yunsii commented May 21, 2020

浠 v4.1.4 鍒 v4.2.4 锛岀揣鍑戞ā寮忎笅鐨勫瓧浣撳拰闂磋窛鎰熻鏈夌偣澶皬浜嗭紝搴旇鎬庝箞鑷畾涔夐厤缃洖 4.1.4 鐨勯偅绉嶆晥鏋滃憿锛

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants