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

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

Open
wants to merge 2 commits into
base: feature
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
2 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
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
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: 18 additions & 1 deletion packages/design/src/theme/default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { formatTheme } from './util/format';
// Calculated by colorBorder and getWeakenBorderColor()
const tagColorBorder = '#cdd5e466';

const colorIcon = '#5c6b8a';

const defaultTheme: ThemeConfig = {
token: {
colorPrimaryBg: '#EAF1FF',
Expand Down Expand Up @@ -59,8 +61,8 @@ const defaultTheme: ThemeConfig = {
colorTextBase: '#132039',
colorText: '#132039',
colorTextSecondary: '#5c6b8a',
colorTextQuaternary: '#c1cbe0',
colorTextTertiary: '#8592AD',
colorTextQuaternary: '#c1cbe0',
colorBgBase: '#ffffff',
colorBgContainer: '#ffffff',
colorBgLayout: '#f3f6fc',
Expand All @@ -70,6 +72,7 @@ const defaultTheme: ThemeConfig = {
colorFillTertiary: '#f3f6fc',
colorFillSecondary: '#e2e8f3',
colorFill: '#cdd5e4',
colorIcon,
colorBgMask: 'rgba(19, 32, 57, 0.45)',
colorBgElevated: '#ffffff',
colorBgSpotlight: '#ffffff',
Expand All @@ -87,9 +90,21 @@ const defaultTheme: ThemeConfig = {
// fontHeight is internal token
fontHeight: 20,
},
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 @@ -99,6 +114,8 @@ const defaultTheme: ThemeConfig = {
multipleItemBg: '#F8FAFE',
multipleItemBorderColor: tagColorBorder,
multipleItemBorderColorDisabled: tagColorBorder,
// customize icon color
colorTextQuaternary: colorIcon,
},
Tag: {
colorBorder: tagColorBorder,
Expand Down
Loading