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

feat(theme): component style && common theme #814

Merged
merged 14 commits into from
Sep 26, 2024
Merged

feat(theme): component style && common theme #814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dcff211
feat(theme): component style && common theme
wenmine Sep 25, 2024
9a3729e
feat(theme): merge refactor/develop
wenmine Sep 25, 2024
cf678a2
feat(theme): common theme & fix review
wenmine Sep 25, 2024
0b7348e
feat(theme): common theme & fix review
wenmine Sep 25, 2024
d847981
feat(theme): common component review
wenmine Sep 25, 2024
aec49fc
feat(theme): check color and fix
wenmine Sep 25, 2024
ebac8f1
feat(style): modify style panel widget margin && style
wenmine Sep 25, 2024
36ce0af
fix(style): fix style layout no working
wenmine Sep 25, 2024
67c9598
fix(style): fix review
wenmine Sep 25, 2024
2a23010
fix(style): fix review
wenmine Sep 26, 2024
e73bc20
fix(style): fix review
wenmine Sep 26, 2024
94a3315
fix(style): fix review
wenmine Sep 26, 2024
bc6b943
fix(style): fix review
wenmine Sep 26, 2024
1f5188d
fix(style): fix review
wenmine Sep 26, 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
2 changes: 1 addition & 1 deletion packages/theme/base/src/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@
/**
* 1.3 字号
**/
--te-base-font-size: 11px; // 正文-常规
--te-base-font-size-sm: 11px; // 正文-常规
wenmine marked this conversation as resolved.
Show resolved Hide resolved
--te-base-font-size-base: 12px; // 正文-常规
--te-base-font-size-1: 14px;
--te-base-font-size-2: 16px;
Expand Down
6 changes: 1 addition & 5 deletions packages/theme/base/src/component-common.less
View file
Open in desktop
chilingling marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
}
}
&.is-disabled .tiny-input__inner {
fill: var(--te-common-text-disabled);
background: var(--te-common-bg-disabled);
color: var(--te-common-text-disabled);
font-size: var(--te-base-font-size-base);
Expand Down Expand Up @@ -265,15 +264,13 @@
border: 1px solid var(--te-common-border-secondary);
color: var(--te-common-text-primary);
background-color: var(--te-common-bg-default);
fill: var(--te-common-bg-default);
&:hover {
border: 1px solid var(--te-common-border-hover);
}
}
// 确认按钮
&.tiny-button--primary {
background-color: var(--te-common-bg-primary);
fill: var(--te-common-bg-primary);
color: var(--te-common-text-inverse);
border: 1px solid var(--te-common-border-active);
&:hover {
Expand Down Expand Up @@ -415,7 +412,6 @@
}
}
.tiny-numeric-base .is-disabled {
fill: var(--te-common-bg-disabled);
background: var(--te-common-bg-disabled);
color: var(--te-common-text-disabled);
}
Expand Down Expand Up @@ -636,7 +632,7 @@
padding-top: 4px;
}
.tiny-form-item__error {
font-size: var(--te-base-font-size);
font-size: var(--te-base-font-size-base);
}
}

Expand Down