feat: support compact theme #22126

AshoneA · 2020-03-11T11:09:18Z

🤔 This is a ...

🔗 Related issue link

close #22068

💡 Background and solution

To support compact theme mode.

📝 Changelog

Language	Changelog
🇺🇸 English	Support compact mode theme
🇨🇳 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

tests-checker

Could you please add tests to make sure this change works as expected?

ant-design-bot · 2020-03-11T11:12:30Z

codesandbox-ci · 2020-03-11T11:19:55Z

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

Sandbox	Source
antd reproduction template	Configuration

codecov · 2020-03-11T11:21:45Z

Codecov Report

Merging #22126 into feature will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           feature   #22126   +/-   ##
========================================
  Coverage    98.07%   98.07%           
========================================
  Files          360      360           
  Lines         7224     7224           
  Branches      1975     1975           
========================================
  Hits          7085     7085           
  Misses         139      139

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 2cfad04...a4f35e5. Read the comment docs.

afc163 · 2020-03-11T13:06:23Z

site/theme/template/Layout/index.jsx

@@ -63,6 +63,7 @@ const SITE_THEME_STORE_KEY = 'site-theme';
 const timestamp = new Date().getTime();
 const themeMap = {
  dark: `/dark.css?${timestamp}`,
+  narrow: `/narrow.css?${timestamp}`,


compact.css 好一点。

嗯，叫 compact 感觉更直接一点，到时候我可以批量替换一下。

afc163 · 2020-03-13T09:30:16Z

components/style/themes/compact.less

+
+// Pagination
+@pagination-item-size: 28px;
+@pagination-item-size-sm: 24px; // todo: should more small?


Keep it -sm.

嗯，之前留着提醒一下的，后面有跟设计师沟通之后改动还没推，周末我会把这些弄掉推一版。

afc163 · 2020-03-19T04:46:39Z

Merge 一下 feature，免得后面冲突更多。

AshoneA · 2020-03-19T04:51:42Z

Merge 一下 feature，免得后面冲突更多。

嗯，晚上我来合下。看着 rtl 的改动，想象到的 conflict，头顶一凉。

afc163 · 2020-03-27T15:04:26Z

site/theme/template/Content/MainContent.jsx

+        {[
+          { type: 'default', text: '普通模式' },
+          { type: 'dark', text: '暗黑模式' },
+          { type: 'compact', text: '紧凑模式' },


默认主题暗黑主题紧凑主题

噢，这边应该用下国际化的。

fixed d08d721

afc163 · 2020-03-27T15:05:26Z

site/theme/static/common.less

  & &-avatar {
+    color: #000;
    background-color: #fff;
    box-shadow: @shadow-2;


加个 transition 过渡

fixed d08d721

afc163 · 2020-03-27T15:06:10Z

site/theme/zh-CN.js

@@ -3,6 +3,8 @@ module.exports = {
  messages: {
    'app.theme.switch.dark': '切换浅色模式',
    'app.theme.switch.default': '切换暗黑模式',
+    'app.theme.switch.normal': '切换紧凑模式',
+    'app.theme.switch.compact': '切换普通模式',


好像用不上了。

site/theme/static/common.less

Co-Authored-By: 偏右 <afc163@gmail.com>

AshoneA · 2020-03-28T09:03:54Z

@zombieJ CI passed.

afc163 · 2020-03-28T11:04:19Z

加个 bundlesize limit：

ant-design/package.json

Lines 271 to 274 in c806a83

    
           { 
        
             "path": "./dist/antd.dark.min.css", 
        
             "maxSize": "65 kB" 
        
           }

AshoneA · 2020-03-28T11:13:38Z

加个 bundlesize limit：

Fixed 0174586

AshoneA · 2020-03-28T12:17:34Z

@afc163 @zombieJ
抽了下生成 dist css 文件，不太确定会不会造成 break，帮忙 review 一下。
a4f35e5

zombieJ · 2020-03-29T02:16:06Z

准备合了，WIP 标志是不是可以去掉了？

feat: support narrow theme mode

de7ae3e

AshoneA added the PR: draft label Mar 11, 2020

AshoneA requested review from afc163 and zombieJ March 11, 2020 11:09

pr-triage bot added PR: unreviewed and removed PR: draft labels Mar 11, 2020

tests-checker bot suggested changes Mar 11, 2020

View reviewed changes

pr-triage bot added PR: reviewed-changes-requested and removed PR: unreviewed labels Mar 11, 2020

AshoneA mentioned this pull request Mar 11, 2020

Provides narrow theme #22068

Closed

34 tasks

zombieJ assigned afc163 and AshoneA Mar 11, 2020

afc163 reviewed Mar 11, 2020

View reviewed changes

afc163 changed the title ~~feat: support narrow mode theme~~ [WIP] feat: support narrow mode theme Mar 11, 2020

pr-triage bot removed the PR: reviewed-changes-requested label Mar 11, 2020

AshoneA added 2 commits March 11, 2020 22:58

chore: rename narrow to compact

6568bfe

chore: height part

a2510fa

afc163 changed the title ~~[WIP] feat: support narrow mode theme~~ [WIP] feat: support compat theme Mar 12, 2020

afc163 changed the base branch from master to feature March 13, 2020 03:43

Merge branch 'feature' into feat/narrow-theme

53be3a1

afc163 reviewed Mar 13, 2020

View reviewed changes

chore: preview compact mode

9b767c6

AshoneA changed the title ~~[WIP] feat: support compat theme~~ [WIP] feat: support compact theme Mar 13, 2020

AshoneA added 2 commits March 14, 2020 23:46

chore: to make site corrected

057532f

chore: preview site

5909a96

chore: fix review bug

21c8f34

afc163 reviewed Mar 27, 2020

View reviewed changes

chore: improve i18n and transition

d08d721

ant-design deleted a comment from todo bot Mar 27, 2020

afc163 reviewed Mar 27, 2020

View reviewed changes

site/theme/static/common.less Outdated Show resolved Hide resolved

AshoneA and others added 4 commits March 28, 2020 01:14

Update site/theme/static/common.less

503580c

Co-Authored-By: 偏右 <afc163@gmail.com>

chore: fix button size and description padding

6d834e9

chore: update snapshots

0e65ee1

Merge branch 'feature' into feat/narrow-theme

9dddb8e

afc163 approved these changes Mar 28, 2020

View reviewed changes

chore: add compact css bundlesize limit

0174586

chore: compact dist support

a4f35e5

zombieJ changed the title ~~[WIP] feat: support compact theme~~ feat: support compact theme Mar 29, 2020

pr-triage bot added the PR: unreviewed label Mar 29, 2020

zombieJ merged commit dda45e4 into feature Mar 29, 2020

zombieJ deleted the feat/narrow-theme branch March 29, 2020 02:39

pr-triage bot added PR: merged and removed PR: unreviewed labels Mar 29, 2020

zombieJ mentioned this pull request Mar 29, 2020

docs: ✨ add 4.1.0 changelog #22721

Merged

10 tasks

snyk-bot mentioned this pull request Mar 31, 2020

[Snyk] Upgrade antd from 4.0.2 to 4.1.0 fnplus/footsteps-app#121

Merged

yoyo837 mentioned this pull request May 8, 2020

style: fix transfer search padding in rtl #23962

Merged

14 tasks

zombieJ unassigned AshoneA Feb 16, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support compact theme #22126

feat: support compact theme #22126

AshoneA commented Mar 11, 2020 •

edited

Loading

tests-checker bot left a comment

ant-design-bot commented Mar 11, 2020 •

edited

Loading

codesandbox-ci bot commented Mar 11, 2020 •

edited

Loading

codecov bot commented Mar 11, 2020 •

edited

Loading

afc163 Mar 11, 2020

AshoneA Mar 11, 2020

afc163 Mar 13, 2020

AshoneA Mar 13, 2020 •

edited

Loading

afc163 commented Mar 19, 2020

AshoneA commented Mar 19, 2020

afc163 Mar 27, 2020

AshoneA Mar 27, 2020

AshoneA Mar 27, 2020

afc163 Mar 27, 2020

AshoneA Mar 27, 2020

afc163 Mar 27, 2020

AshoneA commented Mar 28, 2020

afc163 commented Mar 28, 2020

AshoneA commented Mar 28, 2020

AshoneA commented Mar 28, 2020 •

edited

Loading

zombieJ commented Mar 29, 2020

feat: support compact theme #22126

feat: support compact theme #22126

Conversation

AshoneA commented Mar 11, 2020 • edited Loading

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self Check before Merge

tests-checker bot left a comment

Choose a reason for hiding this comment

ant-design-bot commented Mar 11, 2020 • edited Loading

codesandbox-ci bot commented Mar 11, 2020 • edited Loading

codecov bot commented Mar 11, 2020 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AshoneA Mar 13, 2020 • edited Loading

Choose a reason for hiding this comment

afc163 commented Mar 19, 2020

AshoneA commented Mar 19, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AshoneA commented Mar 28, 2020

afc163 commented Mar 28, 2020

AshoneA commented Mar 28, 2020

AshoneA commented Mar 28, 2020 • edited Loading

zombieJ commented Mar 29, 2020

AshoneA commented Mar 11, 2020 •

edited

Loading

ant-design-bot commented Mar 11, 2020 •

edited

Loading

codesandbox-ci bot commented Mar 11, 2020 •

edited

Loading

codecov bot commented Mar 11, 2020 •

edited

Loading

AshoneA Mar 13, 2020 •

edited

Loading

AshoneA commented Mar 28, 2020 •

edited

Loading