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.

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(comp:modal): add padding to padding next icon #701

Merged
merged 2 commits into from
Jan 13, 2022

Conversation

sallerli1
Copy link
Contributor

add title and content color variables

feat(comp:empty): add color variables

BREAKING CHANGE: replaced empty-color variable with more specific ones

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our guidelines
  • Tests for the changes have been added/updated or not needed
  • Docs and demo have been added/updated or not needed

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Component style update
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Application (the showcase website) / infrastructure changes
  • Other... Please describe:

What is the current behavior?

modal组件缺少title与content的具体颜色变量
modal组件在icon存在的前提下右侧的cotent缺少右边距

empty组件缺少具体的颜色变量

What is the new behavior?

增加 modal组件的 title color 和 content color的变量
增加modal右侧content的右边距,与icon的左边距一致

empty将empty-color替换成3个具体的颜色变量

Other information

@idux-bot
Copy link

idux-bot bot commented Jan 5, 2022

This preview will be available after the AzureCI is passed.

@codecov
Copy link

codecov bot commented Jan 5, 2022

Codecov Report

Merging #701 (07dc559) into main (fbbe478) will decrease coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #701      +/-   ##
==========================================
- Coverage   85.33%   85.30%   -0.04%     
==========================================
  Files         396      396              
  Lines        9945     9948       +3     
  Branches     2304     2303       -1     
==========================================
- Hits         8487     8486       -1     
- Misses       1458     1462       +4     
Impacted Files Coverage Δ
packages/components/i18n/src/locales/zh-CN.ts 100.00% <ø> (ø)
packages/components/modal/src/ModalWrapper.tsx 74.01% <ø> (ø)
packages/components/_private/footer/src/Footer.tsx 96.96% <100.00%> (+0.09%) ⬆️
...s/components/menu/src/composables/useDataSource.ts 41.17% <0.00%> (-8.83%) ⬇️
...nents/menu/src/children/menu-sub/InlineContent.tsx 100.00% <0.00%> (ø)

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 fbbe478...07dc559. Read the comment docs.

@sallerli1 sallerli1 force-pushed the feat-modal&empty-style-saller branch 2 times, most recently from 1faac2e to 657b749 Compare January 6, 2022 07:33
@@ -59,6 +51,13 @@ export default defineComponent({
}
return cancelVisible.value ? locale.value.okText : locale.value.justOkText
})
const okButton = computed<ButtonProps>(() => ({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不应该改这里,而是改 ɵFooter, 因为还有其他几个组件的渲染逻辑应该都是一样的,

@modal-body-confirm-color: @color-warning;
@modal-body-info-color: @color-info;
@modal-body-success-color: @color-success;
@modal-body-warning-color: @color-warning;
@modal-body-error-color: @color-error;

@modal-typed-body-padding: 0 @font-size-lg @font-size-lg @font-size-lg;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
@modal-typed-body-padding: 0 @font-size-lg @font-size-lg @font-size-lg;
@modal-body-typed-padding: 0 @spacing-xl @spacing-sm;

@sallerli1 sallerli1 force-pushed the feat-modal&empty-style-saller branch from a31c4f4 to c23c445 Compare January 6, 2022 10:02
BREAKING CHANGE: replaced empty-color variable with more specific ones
BREAKING CHANGE: replace empty-font-size variable with more specific ones

feat(comp:modal): add body title and content variables to typed modal
change ok button mode to default when there's no cancel button
@sallerli1 sallerli1 force-pushed the feat-modal&empty-style-saller branch from c23c445 to 07dc559 Compare January 12, 2022 10:21
@danranVm danranVm merged commit e663401 into IDuxFE:main Jan 13, 2022
@sallerli1 sallerli1 deleted the feat-modal&empty-style-saller branch February 20, 2023 06:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants