Skip to content

Commit

Permalink
feat(message): message uses n as CSS vars prefix (#1970)
Browse files Browse the repository at this point in the history
  • Loading branch information
XieZongChen authored Dec 22, 2021
1 parent e5c6998 commit 77600ee
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 70 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Feats

- Add `n-avatar-group`.
- `n-message` uses `n` as CSS vars prefix.
- `n-mention` uses `n` as CSS vars prefix.
- `n-menu` uses `n` as CSS vars prefix.
- `n-transfer` uses `n` as CSS vars prefix.
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Feats

- 新增 `n-avatar-group`
- `n-message` 的 CSS 变量使用 `n` 作为前缀
- `n-mention` 的 CSS 变量使用 `n` 作为前缀
- `n-menu` 的 CSS 变量使用 `n` 作为前缀
- `n-transfer` 的 CSS 变量使用 `n` 作为前缀
Expand Down
44 changes: 22 additions & 22 deletions src/message/src/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,28 +83,28 @@ export default defineComponent({
}
} = themeRef.value
return {
'--bezier': cubicBezierEaseInOut,
'--margin': margin,
'--padding': padding,
'--max-width': maxWidth,
'--font-size': fontSize,
'--icon-margin': iconMargin,
'--icon-size': iconSize,
'--close-size': closeSize,
'--close-margin': closeMargin,
'--text-color': textColor,
'--color': color,
'--box-shadow': boxShadow,
'--icon-color-info': iconColorInfo,
'--icon-color-success': iconColorSuccess,
'--icon-color-warning': iconColorWarning,
'--icon-color-error': iconColorError,
'--icon-color-loading': iconColorLoading,
'--close-color': closeColor,
'--close-color-pressed': closeColorPressed,
'--close-color-hover': closeColorHover,
'--line-height': lineHeight,
'--border-radius': borderRadius
'--n-bezier': cubicBezierEaseInOut,
'--n-margin': margin,
'--n-padding': padding,
'--n-max-width': maxWidth,
'--n-font-size': fontSize,
'--n-icon-margin': iconMargin,
'--n-icon-size': iconSize,
'--n-close-size': closeSize,
'--n-close-margin': closeMargin,
'--n-text-color': textColor,
'--n-color': color,
'--n-box-shadow': boxShadow,
'--n-icon-color-info': iconColorInfo,
'--n-icon-color-success': iconColorSuccess,
'--n-icon-color-warning': iconColorWarning,
'--n-icon-color-error': iconColorError,
'--n-icon-color-loading': iconColorLoading,
'--n-close-color': closeColor,
'--n-close-color-pressed': closeColorPressed,
'--n-close-color-hover': closeColorHover,
'--n-line-height': lineHeight,
'--n-border-radius': borderRadius
}
}),
placement: messageProviderProps.placement
Expand Down
96 changes: 48 additions & 48 deletions src/message/src/styles/index.cssr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@ import iconSwitchTransition from '../../../_styles/transitions/icon-switch.cssr'
import fadeInHeightExpand from '../../../_styles/transitions/fade-in-height-expand.cssr'

// vars:
// --margin
// --bezier
// --padding
// --max-width
// --font-size
// --icon-margin
// --icon-size
// --close-size
// --close-margin
// --text-color
// --color
// --box-shadow
// --icon-color-info
// --icon-color-success
// --icon-color-warning
// --icon-color-error
// --icon-color-loading
// --close-color
// --close-color-pressed
// --close-color-hover
// --border-radius
// --n-margin
// --n-bezier
// --n-padding
// --n-max-width
// --n-font-size
// --n-icon-margin
// --n-icon-size
// --n-close-size
// --n-close-margin
// --n-text-color
// --n-color
// --n-box-shadow
// --n-icon-color-info
// --n-icon-color-success
// --n-icon-color-warning
// --n-icon-color-error
// --n-icon-color-loading
// --n-close-color
// --n-close-color-pressed
// --n-close-color-hover
// --n-border-radius
export default c([
cB('message-wrapper', `
margin: var(--margin);
margin: var(--n-margin);
z-index: 0;
transform-origin: top center;
display: flex;
`, [
fadeInHeightExpand({
overflow: 'visible',
originalTransition: 'transform .3s var(--bezier)',
originalTransition: 'transform .3s var(--n-bezier)',
enterToProps: {
transform: 'scale(1)'
},
Expand All @@ -47,39 +47,39 @@ export default c([
display: flex;
align-items: center;
transition:
color .3s var(--bezier),
box-shadow .3s var(--bezier),
background-color .3s var(--bezier),
opacity .3s var(--bezier),
transform .3s var(--bezier),
margin-bottom .3s var(--bezier);
padding: var(--padding);
border-radius: var(--border-radius);
color .3s var(--n-bezier),
box-shadow .3s var(--n-bezier),
background-color .3s var(--n-bezier),
opacity .3s var(--n-bezier),
transform .3s var(--n-bezier),
margin-bottom .3s var(--n-bezier);
padding: var(--n-padding);
border-radius: var(--n-border-radius);
flex-wrap: nowrap;
overflow: hidden;
max-width: var(--max-width);
color: var(--text-color);
background-color: var(--color);
box-shadow: var(--box-shadow);
max-width: var(--n-max-width);
color: var(--n-text-color);
background-color: var(--n-color);
box-shadow: var(--n-box-shadow);
`, [
cE('content', `
display: inline-block;
line-height: var(--line-height);
font-size: var(--font-size);
line-height: var(--n-line-height);
font-size: var(--n-font-size);
`),
cE('icon', `
position: relative;
margin: var(--icon-margin);
height: var(--icon-size);
width: var(--icon-size);
font-size: var(--icon-size);
margin: var(--n-icon-margin);
height: var(--n-icon-size);
width: var(--n-icon-size);
font-size: var(--n-icon-size);
flex-shrink: 0;
`, [
['info', 'success', 'warning', 'error', 'loading'].map((type) =>
cM(`${type}-type`, [
c('> *', `
color: var(--icon-color-${type});
transition: color .3s var(--bezier);
color: var(--n-icon-color-${type});
transition: color .3s var(--n-bezier);
`)
])
),
Expand All @@ -93,16 +93,16 @@ export default c([
[iconSwitchTransition()])
]),
cE('close', `
font-size: var(--close-size);
margin: var(--close-margin);
transition: color .3s var(--bezier);
font-size: var(--n-close-size);
margin: var(--n-close-margin);
transition: color .3s var(--n-bezier);
flex-shrink: 0;
`, [
c('&:hover', `
color: var(--close-color-hover);
color: var(--n-close-color-hover);
`),
c('&:active', `
color: var(--close-color-pressed);
color: var(--n-close-color-pressed);
`)
])
]),
Expand Down

0 comments on commit 77600ee

Please sign in to comment.