Skip to content

[WIP] [Feature Branch] improve(design): Customize colorIcon token #654

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

Open
dengfuping wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] [Feature Branch] improve(design): Customize colorIcon token #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69f6889
improve(design): colorIcon change to #5c6b8a as same as colorTextSeco…
dengfuping Jul 23, 2024
2e74b3f
improve(design): Custom colorTextQuaternary token for icon of ColorPi…
dengfuping Jul 24, 2024
4bde24b
chore(merge): Merge master branch and fix conflicts
dengfuping Apr 25, 2025
b53ff25
chore(deps): Upgrade deps to latest
dengfuping Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.6.1",
"@types/lodash": "^4.17.16",
"@types/node": "^20.17.30",
"@types/node": "^20.17.31",
"@types/react": "^18.3.20",
"@umijs/fabric": "^4.0.1",
"@umijs/test": "^4.4.6",
"@umijs/test": "^4.4.10",
"@vercel/analytics": "^1.5.0",
"antd": "^5.24.7",
"antd": "^5.24.8",
"antd-style": "^3.7.1",
"antd-token-previewer": "^2.0.8",
"babel-jest": "^29.7.0",
Expand All @@ -82,7 +82,7 @@
"father": "^4.5.2",
"fs-extra": "^11.3.0",
"gh-pages": "^6.3.0",
"glob": "^11.0.1",
"glob": "^11.0.2",
"html2sketch": "^1.0.2",
"husky": "^9.1.7",
"identity-obj-proxy": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/codemod/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"command-exists": "^1.2.9",
"execa": "^5.1.1",
"find-up": "^7.0.0",
"glob": "^11.0.1",
"glob": "^11.0.2",
"is-directory": "^0.3.1",
"is-git-clean": "^1.1.0",
"jscodeshift": "^0.16.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/design/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@oceanbase/icons": "workspace:^",
"@oceanbase/util": "workspace:^",
"ahooks": "^2.10.14",
"antd": "^5.24.7",
"antd": "^5.24.8",
"classnames": "^2.5.1",
"lodash": "^4.17.21",
"lottie-web": "^5.12.2",
Expand Down
6 changes: 1 addition & 5 deletions packages/design/src/select/style/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ export type SelectToken = FullToken<'Select'>;
export const genSelectStyle: GenerateStyle<SelectToken> = (token: SelectToken): CSSObject => {
const { componentCls } = token;
return {
[`${componentCls}`]: {
[`${componentCls}-arrow${componentCls}-arrow-loading`]: {
color: token.colorTextTertiary,
},
},
[`${componentCls}`]: {},
};
};

Expand Down
19 changes: 17 additions & 2 deletions packages/design/src/theme/default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { formatTheme } from './util/format';

// Calculated by colorBorder and getWeakenBorderColor()
const tagColorBorder = '#cdd5e466';

const colorIcon = '#5c6b8a';
export const fontFamilyEn = `Inter, 'Noto sans', sans-serif, Roboto, 'Open Sans', 'Segoe UI', 'Helvetica Neue', 'Helvetica, Arial', 'Apple Color Emoji'`;

const defaultTheme: ThemeConfig = {
Expand Down Expand Up @@ -63,8 +63,8 @@ const defaultTheme: ThemeConfig = {
colorTextBase: '#000000',
colorText: '#132039',
colorTextSecondary: '#5c6b8a',
colorTextQuaternary: '#c1cbe0',
colorTextTertiary: '#8592AD',
colorTextQuaternary: '#c1cbe0',
colorBgBase: '#ffffff',
colorBgContainer: '#ffffff',
colorBgLayout: '#f3f6fc',
Expand All @@ -74,6 +74,7 @@ const defaultTheme: ThemeConfig = {
colorFillTertiary: '#f3f6fc',
colorFillSecondary: '#e2e8f3',
colorFill: '#cdd5e4',
colorIcon,
colorBgMask: 'rgba(19, 32, 57, 0.45)',
colorBgElevated: '#ffffff',
colorBgSpotlight: '#ffffff',
Expand All @@ -97,9 +98,21 @@ const defaultTheme: ThemeConfig = {
Collapse: {
colorBorder: '#E2E8F3',
},
ColorPicker: {
// customize icon color
colorTextQuaternary: colorIcon,
},
Input: {
// customize icon color
colorTextQuaternary: colorIcon,
},
InputNumber: {
handleVisible: true,
},
Mentions: {
// customize icon color
colorTextQuaternary: colorIcon,
},
Radio: {
// temporarily fix style for checked disabled Radio.Button
controlItemBgActiveDisabled: '#e2e8f3',
Expand All @@ -109,6 +122,8 @@ const defaultTheme: ThemeConfig = {
multipleItemBg: '#F8FAFE',
multipleItemBorderColor: tagColorBorder,
multipleItemBorderColorDisabled: tagColorBorder,
// customize icon color
colorTextQuaternary: colorIcon,
},
Slider: {
trackBg: '#006AFF',
Expand Down
2 changes: 1 addition & 1 deletion packages/design/src/theme/style/compact.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@
@borderRadiusSM: 4;
@borderRadiusLG: 8;
@borderRadiusOuter: 4;
@colorIcon: #8592ad;
@boxShadowSecondary: 0 6px 16px 0 rgba(54, 69, 99, 0.08), 0 3px 6px -4px rgba(54, 69, 99, 0.12), 0 9px 28px 8px rgba(54, 69, 99, 0.05);
@boxShadow: 0 1px 2px 0 rgba(54, 69, 99, 0.03), 0 1px 6px -1px rgba(54, 69, 99, 0.02), 0 2px 4px 0 rgba(54, 69, 99, 0.02);
@lineWidthFocus: 3;
Expand All @@ -430,7 +431,6 @@
@colorHighlight: #f93939;
@colorBgTextHover: #e2e8f3;
@colorBgTextActive: #cdd5e4;
@colorIcon: #8592ad;
@colorIconHover: #132039;
@colorErrorOutline: rgba(255,5,5,0.08);
@colorWarningOutline: rgba(255,164,19,0.11);
Expand Down
2 changes: 1 addition & 1 deletion packages/design/src/theme/style/default.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@
@borderRadiusSM: 4;
@borderRadiusLG: 8;
@borderRadiusOuter: 4;
@colorIcon: #8592ad;
@boxShadowSecondary: 0 6px 16px 0 rgba(54, 69, 99, 0.08), 0 3px 6px -4px rgba(54, 69, 99, 0.12), 0 9px 28px 8px rgba(54, 69, 99, 0.05);
@boxShadow: 0 1px 2px 0 rgba(54, 69, 99, 0.03), 0 1px 6px -1px rgba(54, 69, 99, 0.02), 0 2px 4px 0 rgba(54, 69, 99, 0.02);
@lineWidthFocus: 3;
Expand All @@ -430,7 +431,6 @@
@colorHighlight: #f93939;
@colorBgTextHover: #e2e8f3;
@colorBgTextActive: #cdd5e4;
@colorIcon: #8592ad;
@colorIconHover: #132039;
@colorErrorOutline: rgba(255,5,5,0.08);
@colorWarningOutline: rgba(255,164,19,0.11);
Expand Down
Loading