From 2fb139a3e3ff142d8a931871e9c35a5214ac9ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E6=B8=B8=E5=90=9B?= Date: Fri, 30 Jul 2021 16:22:23 +0800 Subject: [PATCH] refactor(link): remove unused link variables & add sass map (#2768) --- packages/theme-chalk/src/common/var.scss | 23 ++++++++++++++--------- packages/theme-chalk/src/link.scss | 7 ++----- packages/theme-chalk/src/upload.scss | 2 +- packages/theme-chalk/src/var.scss | 4 ---- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/theme-chalk/src/common/var.scss b/packages/theme-chalk/src/common/var.scss index b6cb441bbb..3ccd148734 100644 --- a/packages/theme-chalk/src/common/var.scss +++ b/packages/theme-chalk/src/common/var.scss @@ -118,11 +118,6 @@ $--border-color: map.merge( /// color|1|Background Color|4 $--background-color-base: #f5f7fa !default; -/* Link --------------------------- */ -$--link-color: map.get($--colors, 'primary', 'light-2') !default; -$--link-hover-color: $--color-primary !default; - /* Border -------------------------- */ $--border-width-base: 1px !default; @@ -506,7 +501,7 @@ $--dropdown: map.merge( ( 'menu-box-shadow': var(--el-box-shadow-light), 'menuItem-hover-fill': var(--el-color-primary-light-9), - 'menuItem-hover-color': var(--el-link-color), + 'menuItem-hover-color': var(--el-color-primary-light-2), 'menu-index': 10, ), $--dropdown @@ -514,7 +509,7 @@ $--dropdown: map.merge( /* Badge -------------------------- */ -// Css3 var in packages/theme-chalk/src/badge.scss +// css3 var in packages/theme-chalk/src/badge.scss $--badge: () !default; $--badge: map.merge( ( @@ -618,8 +613,18 @@ $--rate: map.merge( /* Link --------------------------*/ -// refactor with css3 var -// See packages/theme-chalk/src/link.scss +// css3 var in packages/theme-chalk/src/link.scss +$--link: () !default; +$--link: map.merge( + ( + 'font-size': var(--el-font-size-base), + 'font-weight': var(--el-font-weight-primary), + 'default-font-color': var(--el-text-color-regular), + 'default-active-color': var(--el-color-primary), + 'disabled-font-color': var(--el-text-color-placeholder), + ), + $--link +); /* Calendar --------------------------*/ diff --git a/packages/theme-chalk/src/link.scss b/packages/theme-chalk/src/link.scss index 3f3e0c6b83..55925ccbe8 100644 --- a/packages/theme-chalk/src/link.scss +++ b/packages/theme-chalk/src/link.scss @@ -1,16 +1,13 @@ @use "sass:map"; @import 'mixins/mixins'; +@import 'mixins/var'; @import 'common/var'; $types: primary, success, warning, danger, info; :root { - --el-link-font-size: var(--el-font-size-base); - --el-link-font-weight: var(--el-font-weight-primary); - --el-link-default-font-color: var(--el-text-color-regular); - --el-link-default-active-color: var(--el-color-primary); - --el-link-disabled-font-color: var(--el-text-color-placeholder); + @include set-component-css-var('link', $--link); @each $type in $types { --el-link-#{$type}-font-color: var(--el-color-#{$type}); diff --git a/packages/theme-chalk/src/upload.scss b/packages/theme-chalk/src/upload.scss index 20605dcba2..a8a60f6963 100644 --- a/packages/theme-chalk/src/upload.scss +++ b/packages/theme-chalk/src/upload.scss @@ -194,7 +194,7 @@ .#{$namespace}-upload-list__item-name:hover, .#{$namespace}-upload-list__item-name:focus { - color: $--link-hover-color; + color: var(--el-color-primary); cursor: pointer; } diff --git a/packages/theme-chalk/src/var.scss b/packages/theme-chalk/src/var.scss index 10d2319076..ea649651d2 100644 --- a/packages/theme-chalk/src/var.scss +++ b/packages/theme-chalk/src/var.scss @@ -38,10 +38,6 @@ // Background --el-background-color-base: #{$--background-color-base}; - // Link - --el-link-color: var(--el-color-primary-light-2); - --el-link-hover-color: var(--el-color-primary); - // Border --el-border-width-base: #{$--border-width-base}; --el-border-style-base: #{$--border-style-base};