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

style(components): [message] Update message style #15912

Merged
merged 2 commits into from Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/examples/message/basic.vue
Expand Up @@ -8,12 +8,12 @@ import { h } from 'vue'
import { ElMessage } from 'element-plus'

const open = () => {
ElMessage('this is a message.')
ElMessage('This is a message.')
}

const openVn = () => {
ElMessage({
message: h('p', null, [
message: h('p', { style: 'line-height: 1; font-size: 14px' }, [
h('span', null, 'Message can be '),
h('i', { style: 'color: teal' }, 'VNode'),
]),
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/message/closable.vue
@@ -1,8 +1,8 @@
<template>
<el-button :plain="true" @click="open1">message</el-button>
<el-button :plain="true" @click="open2">success</el-button>
<el-button :plain="true" @click="open3">warning</el-button>
<el-button :plain="true" @click="open4">error</el-button>
<el-button :plain="true" @click="open1">Message</el-button>
<el-button :plain="true" @click="open2">Success</el-button>
<el-button :plain="true" @click="open3">Warning</el-button>
<el-button :plain="true" @click="open4">Error</el-button>
</template>

<script lang="ts" setup>
Expand Down
10 changes: 5 additions & 5 deletions docs/examples/message/different-types.vue
@@ -1,15 +1,15 @@
<template>
<el-button :plain="true" @click="open2">success</el-button>
<el-button :plain="true" @click="open3">warning</el-button>
<el-button :plain="true" @click="open1">message</el-button>
<el-button :plain="true" @click="open4">error</el-button>
<el-button :plain="true" @click="open2">Success</el-button>
<el-button :plain="true" @click="open3">Warning</el-button>
<el-button :plain="true" @click="open1">Message</el-button>
<el-button :plain="true" @click="open4">Error</el-button>
</template>

<script lang="ts" setup>
import { ElMessage } from 'element-plus'

const open1 = () => {
ElMessage('this is a message.')
ElMessage('This is a message.')
}
const open2 = () => {
ElMessage({
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/message/grouping.vue
Expand Up @@ -7,7 +7,7 @@ import { ElMessage } from 'element-plus'

const open = () => {
ElMessage({
message: 'this is a message.',
message: 'This is a message.',
grouping: true,
type: 'success',
})
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/message/raw-html.vue
@@ -1,5 +1,5 @@
<template>
<el-button :plain="true" @click="openHTML">Use HTML String</el-button>
<el-button :plain="true" @click="openHTML">Use HTML string</el-button>
</template>

<script lang="ts" setup>
Expand Down
Expand Up @@ -106,7 +106,7 @@ describe('Message on command', () => {

test('correct space when set offset', async () => {
const offset = 100
const space = 20
const space = 16
const messages = [Message({ offset }), Message({ offset })]

await rAF()
Expand Down
2 changes: 1 addition & 1 deletion packages/components/message/src/instance.ts
Expand Up @@ -31,5 +31,5 @@ export const getLastOffset = (id: string): number => {

export const getOffsetOrSpace = (id: string, offset: number) => {
const idx = instances.findIndex((instance) => instance.id === id)
return idx > 0 ? 20 : offset
return idx > 0 ? 16 : offset
}
2 changes: 1 addition & 1 deletion packages/theme-chalk/src/common/var.scss
Expand Up @@ -534,7 +534,7 @@ $message: map.merge(
(
'bg-color': getCssVar('color', 'info', 'light-9'),
'border-color': getCssVar('border-color-lighter'),
'padding': 15px 19px,
'padding': 11px 15px,
'close-size': 16px,
'close-icon-color': getCssVar('text-color-placeholder'),
'close-hover-color': getCssVar('text-color-secondary'),
Expand Down
15 changes: 1 addition & 14 deletions packages/theme-chalk/src/message.scss
Expand Up @@ -23,17 +23,12 @@
padding: getCssVar('message', 'padding');
display: flex;
align-items: center;
gap: 8px;

@include when(center) {
justify-content: center;
}

@include when(closable) {
.#{$namespace}-message__content {
padding-right: 31px;
}
}

p {
margin: 0;
}
Expand Down Expand Up @@ -61,10 +56,6 @@
}
}

@include e(icon) {
margin-right: 10px;
}

.#{$namespace}-message__badge {
position: absolute;
top: -8px;
Expand All @@ -81,10 +72,6 @@
}

& .#{$namespace}-message__closeBtn {
position: absolute;
top: 50%;
right: 19px;
transform: translateY(-50%);
cursor: pointer;
color: getCssVar('message', 'close-icon-color');
font-size: getCssVar('message', 'close-size');
Expand Down