diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 13d0547b8..3001161eb 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -167,7 +167,7 @@ justify-content: space-between; .form__labels-label__span { i { - color: $--asset-label-btn-icon-color; + color: $--nz-icon-color; } } } @@ -182,7 +182,7 @@ background-color: $--asset-label-btn-background-color; i { - color: $--asset-label-btn-icon-color; + color: $--nz-icon-color; } } .form__flex-container { diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss index 062f8fcd8..31993e939 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss @@ -140,7 +140,7 @@ top: 15px; background: rgba(236,127,102,0.1); padding: 2px 6px; - color: #EC7F66; + color: $--nz-icon-color; } .endpoint-title{ border: 1px solid $--border-color-light; @@ -227,7 +227,7 @@ border: none!important; } .param-box-row-symbol { - color: $--color-text-regular; + color: $--color-text-regular !important; } .module-form__label { padding-bottom: 6px; @@ -235,3 +235,19 @@ line-height: 16px; color: $--color-text-regular; } +.el-tooltip__popper.prevent-clickoutside { + background-color: $--background-color-empty; +} +.vue-tags-input,.ti-new-tag-input { + background-color: $--value-input-background-color !important; + .ti-input { + border: 1px solid $--border-color-light; + .ti-tag.ti-valid { + background-color: $--value-background-color; + color: $--value-color; + } + .ti-new-tag-input { + color: $--color-text-regular !important; + } + } +} diff --git a/nezha-fronted/src/assets/css/components/common/v-selectpagenew/selectpage.scss b/nezha-fronted/src/assets/css/components/common/v-selectpagenew/selectpage.scss index dbf0fa135..a65370d4a 100644 --- a/nezha-fronted/src/assets/css/components/common/v-selectpagenew/selectpage.scss +++ b/nezha-fronted/src/assets/css/components/common/v-selectpagenew/selectpage.scss @@ -1,5 +1,8 @@ -.el-picker-panel,.sp-base.sp-inputs,.sp-search,.sp-result-area,.sp-pagination{ - background: $--background-color-empty !important; +.el-picker-panel,.sp-base.sp-inputs{ + background: $--input-background-color !important; +} +.sp-search,.sp-result-area,.sp-pagination { + background-color: $--background-color-empty !important; } .el-date-table td.today span { color: $--button-primary-color !important; @@ -17,9 +20,15 @@ } .sp-selected-tag { color: $--color-text-regular !important; - background-color: $--background-color-base !important; + background-color: $--select-page-tag-background-color !important; i { - color: #aaa !important; + color: $--color-text-regular !important; + } +} +.sp-selected-tag:hover { + background-color: $--background-color-empty !important; + i:hover { + color: $--color-text-primary !important; } } .sp-search-input { diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index 2f2f84bdf..476fe8dbf 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -127,7 +127,6 @@ $--button-icon-hover-border-color: $--button-icon-border-color; // hover边框 $--button-icon-active-border-color: $--color-text-primary; // focus边框色 /* Asset */ -$--asset-label-btn-icon-color: $--button-primary-color; //icon $--asset-label-btn-border-color: $--border-color-light; // border $--asset-label-btn-background-color: #222329; // background @@ -140,6 +139,15 @@ $--click-search-items-color: $--color-text-regular; // color $--select-page-background-color: $--background-color-empty; $--select-page-hover-background-color: $--button-light-hover-background-color; $--select-page-focus-color: #666666; +$--select-page-tag-background-color: $--background-color-empty; + +// icon字色 +$--nz-icon-color: $--button-primary-color; + +// value +$--value-background-color: $--background-color-empty; +$--value-input-background-color: $--background-color-base; +$--value-color: $--table-header-font-color; /* 13.panel */ $--chart-title-hover-background-color: #323238; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index 19e75c623..b80d0301f 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -125,7 +125,6 @@ $--button-icon-hover-border-color: $--border-color-base; // hover边框色 $--button-icon-active-border-color: mix(#FFF, $--color-primary, 10%); // focus边框色 /* Asset */ -$--asset-label-btn-icon-color: $--color-primary; //icon $--asset-label-btn-border-color: mix(#FFF, $--color-primary, 60%); // border $--asset-label-btn-background-color: #FFF4E8; // background @@ -135,9 +134,18 @@ $--click-search-items-border-bottom-color: $--border-color-base; // border $--click-search-items-color: $--color-primary; // color // selectPage -$--select-page-background-color: $--background-color-empty; +$--select-page-background-color: $--background-color-base; $--select-page-hover-background-color: #f6f8fa; $--select-page-focus-color: #CCCCCC; +$--select-page-tag-background-color: #e4eaee; + +// icon 字色 +$--nz-icon-color: $--color-primary; //icon + +// value +$--value-background-color: #5C6BC0; +$--value-color: #FFFFFF; +$--value-input-background-color: $--value-color; /* 13.panel */ $--chart-title-hover-background-color: $--background-color-1;