From 158e5a8a23e1035cc953ef224699b30c1bb6d2ad Mon Sep 17 00:00:00 2001 From: gjfei <33827314+gjfei@users.noreply.github.com> Date: Sat, 5 Mar 2022 20:34:01 +0800 Subject: [PATCH] fix(theme-chalk): namespace (#6416) --- packages/theme-chalk/src/cascader-panel.scss | 2 +- packages/theme-chalk/src/date-picker/date-table.scss | 8 ++++---- packages/theme-chalk/src/menu.scss | 2 +- packages/theme-chalk/src/option-item.scss | 4 ++-- packages/theme-chalk/src/page-header.scss | 2 +- packages/theme-chalk/src/pagination.scss | 4 ++-- packages/theme-chalk/src/table.scss | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/theme-chalk/src/cascader-panel.scss b/packages/theme-chalk/src/cascader-panel.scss index 67e317b2f1..cd56d7c189 100644 --- a/packages/theme-chalk/src/cascader-panel.scss +++ b/packages/theme-chalk/src/cascader-panel.scss @@ -33,7 +33,7 @@ @include e(wrap) { // Raise the priority - &.el-scrollbar__wrap { + &.#{$namespace}-scrollbar__wrap { height: 204px; } } diff --git a/packages/theme-chalk/src/date-picker/date-table.scss b/packages/theme-chalk/src/date-picker/date-table.scss index 17b9ef3f61..6dcf232d0e 100644 --- a/packages/theme-chalk/src/date-picker/date-table.scss +++ b/packages/theme-chalk/src/date-picker/date-table.scss @@ -8,25 +8,25 @@ @include when(week-mode) { .#{$namespace}-date-table__row { &:hover { - .el-date-table-cell { + .#{$namespace}-date-table-cell { background-color: var(--el-datepicker-inrange-bg-color); } td.available:hover { color: var(--el-datepicker-text-color); } - td:first-child .el-date-table-cell { + td:first-child .#{$namespace}-date-table-cell { margin-left: 5px; border-top-left-radius: 15px; border-bottom-left-radius: 15px; } - td:last-child .el-date-table-cell { + td:last-child .#{$namespace}-date-table-cell { margin-right: 5px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; } } - &.current .el-date-table-cell { + &.current .#{$namespace}-date-table-cell { background-color: var(--el-datepicker-inrange-bg-color); } } diff --git a/packages/theme-chalk/src/menu.scss b/packages/theme-chalk/src/menu.scss index deb24c5f0e..c9b3a74cbf 100644 --- a/packages/theme-chalk/src/menu.scss +++ b/packages/theme-chalk/src/menu.scss @@ -232,7 +232,7 @@ color: inherit; } } - .el-menu-tooltip__trigger { + .#{$namespace}-menu-tooltip__trigger { position: absolute; left: 0; top: 0; diff --git a/packages/theme-chalk/src/option-item.scss b/packages/theme-chalk/src/option-item.scss index b979996306..9c1d2ada6d 100644 --- a/packages/theme-chalk/src/option-item.scss +++ b/packages/theme-chalk/src/option-item.scss @@ -47,12 +47,12 @@ } @include when(multiple) { - .el-select-dropdown__option-item { + .#{$namespace}-select-dropdown__option-item { &.is-selected { color: map.get($select-option, 'selected-text-color'); background-color: map.get($select-dropdown, 'bg-color'); - & .el-icon { + & .#{$namespace}-icon { position: absolute; right: 20px; top: 0; diff --git a/packages/theme-chalk/src/page-header.scss b/packages/theme-chalk/src/page-header.scss index 7e21b5d94e..d87dd03bab 100644 --- a/packages/theme-chalk/src/page-header.scss +++ b/packages/theme-chalk/src/page-header.scss @@ -28,7 +28,7 @@ display: flex; align-items: center; - .el-icon { + .#{$namespace}-icon { font-size: inherit; } } diff --git a/packages/theme-chalk/src/pagination.scss b/packages/theme-chalk/src/pagination.scss index 78db8ccf9a..b4ca539c15 100644 --- a/packages/theme-chalk/src/pagination.scss +++ b/packages/theme-chalk/src/pagination.scss @@ -10,7 +10,7 @@ margin-left: 0; } - & + .el-pager { + & + .#{$namespace}-pager { .number { &:first-child { margin-left: 0; @@ -144,7 +144,7 @@ line-height: var(--el-pagination-line-height-extra-small); .#{$namespace}-input__suffix-inner { line-height: var(--el-pagination-line-height-extra-small); - i.el-select__caret { + i.#{$namespace}-select__caret { line-height: var(--el-pagination-line-height-extra-small); } } diff --git a/packages/theme-chalk/src/table.scss b/packages/theme-chalk/src/table.scss index 81a9ab416a..e919853862 100644 --- a/packages/theme-chalk/src/table.scss +++ b/packages/theme-chalk/src/table.scss @@ -396,7 +396,7 @@ @include e((header-wrapper, body-wrapper)) { .#{$namespace}-table-column--selection { - .el-checkbox { + .#{$namespace}-checkbox { height: unset; } }