Skip to content

refactor:calendar #6269

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
merge feat-v4
  • Loading branch information
shifeng1993 committed Feb 13, 2023
commit 8202d8cb4951a9934f341322788c8afcc26950e6
2 changes: 1 addition & 1 deletion components/input/style/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ const genTextAreaStyle: GenerateStyle<InputToken> = token => {
[`> ${componentCls}`]: {
height: '100%',
},

'&::after': {
color: token.colorTextDescription,
whiteSpace: 'nowrap',
Expand Down
4 changes: 2 additions & 2 deletions components/theme/interface/components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import type { ComponentToken as BackTopComponentToken } from '../../back-top/sty
import type { ComponentToken as ButtonComponentToken } from '../../button/style';
// import type { ComponentToken as FloatButtonComponentToken } from '../../float-button/style';
import type { ComponentToken as CalendarComponentToken } from '../../calendar/style';
// import type { ComponentToken as CardComponentToken } from '../../card/style';
// import type { ComponentToken as CarouselComponentToken } from '../../carousel/style';
import type { ComponentToken as CardComponentToken } from '../../card/style';
import type { ComponentToken as CarouselComponentToken } from '../../carousel/style';
// import type { ComponentToken as CascaderComponentToken } from '../../cascader/style';
// import type { ComponentToken as CheckboxComponentToken } from '../../checkbox/style';
// import type { ComponentToken as CollapseComponentToken } from '../../collapse/style';
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.