From 891c51c55e58274751b47e4f838c9c5b6b3c5bb5 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Wed, 24 Nov 2021 10:53:50 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common.scss | 6 +++ .../common/rightBox/alertSilenceBox.scss | 12 +++++- .../common/v-selectpagenew/selectpage.scss | 42 +++++++++++++------ .../src/assets/css/themes/theme-dark.scss | 6 +++ .../src/assets/css/themes/theme-light.scss | 6 +++ .../common/rightBox/alertSilenceBox.vue | 2 +- 6 files changed, 58 insertions(+), 16 deletions(-) diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index ccad976e2..8369c9661 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -250,6 +250,12 @@ td .nz-icon-gear:before{ border: 1px solid $--border-color-light; } } +.nz-icon-create-square { + color: $--nz-icon-color !important; +} +.el-scrollbar { + background-color: $--background-color-empty; +} //.editor-core { // p { // color: $--color-text-regular; diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss index c0025baa8..032e24fa3 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss @@ -1,13 +1,21 @@ .range-time { .el-radio-button--small .el-radio-button__inner,.el-radio-group { width: 100%; + } + .el-radio-group { + border-left: 1px solid $--border-color-light; + } + .el-radio-button__inner { + border: 1px solid $--border-color-light; + border-left: 0; + background-color: $--background-color-empty; + } + .el-button.is-plain { background-color: $--background-color-empty; } - .el-radio-button { width: 14.2% } - .el-date-editor.el-range-editor.el-input__inner.el-date-editor--datetimerange.el-range-editor--mini { width: 100%; } 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 ccc186077..1b2c3a28e 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,34 +1,34 @@ .el-picker-panel,.sp-base.sp-inputs,.sp-base.sp-input,.el-picker-panel__footer{ - background: $--input-background-color !important; + background: $--input-background-color; } .sp-search,.sp-result-area,.sp-pagination { - background-color: $--background-color-empty !important; + background-color: $--background-color-empty; } -.el-date-table td.today span { - color: $--button-primary-color !important; +.el-date-table td.today.available span { + color: $--select-page-color !important; } .sp-table { th { - color: $--color-text-primary !important; + color: $--color-text-primary; } td { - color: $--color-text-regular !important; + color: $--color-text-regular; } } .sp-page-info,.sp-result-message { - color: $--color-text-regular !important; + color: $--color-text-regular; } .sp-selected-tag { - color: $--color-text-regular !important; - background-color: $--select-page-tag-background-color !important; + color: $--color-text-regular; + background-color: $--select-page-tag-background-color; i { - color: $--color-text-regular !important; + color: $--color-text-regular; } } .sp-selected-tag:hover { - background-color: $--background-color-empty !important; + background-color: $--background-color-empty; i:hover { - color: $--color-text-primary !important; + color: $--color-text-primary; } } .sp-search-input { @@ -85,7 +85,23 @@ div.v-selectpage div.sp-input-container.sp-open div.sp-input { color: $--color-primary; } } + .el-button--default { + margin-left: 10px; + color: $--button-primary-color; + background: $--select-page-btn-background-color; + border: 1px solid $--border-color-light; + } + .el-button.is-plain:hover { + background-color: $--select-page-btn-background-color; + border-color: $--select-page-btn-border-color; + span { + color: $--select-page-btn-color; + } + } } -.el-date-picker__time-header,.el-date-table th { +.el-date-table th { border-bottom: 1px solid $--border-color-light; } +.el-date-picker__time-header { + border-bottom: 1px solid $--select-page-border-color; +} diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index dd50475f4..326cf085c 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -139,7 +139,13 @@ $--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-color: $--button-primary-color; $--select-page-tag-background-color: $--background-color-empty; +$--select-page-border-color: $--border-color-light; +$--select-page-btn-color: mix(#FFF, $--color-primary, 15%); +$--select-page-btn-border-color: mix(#FFF, $--color-primary, 15%); +$--select-page-btn-background-color: $--background-color-base; + // icon字色 $--nz-icon-color: $--button-primary-color; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index 84aae22fc..fe7cbcf4b 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -137,7 +137,13 @@ $--click-search-items-color: $--color-primary; // color $--select-page-background-color: $--background-color-base; $--select-page-hover-background-color: #f6f8fa; $--select-page-focus-color: #CCCCCC; +$--select-page-color: #232F3E; $--select-page-tag-background-color: #e4eaee; +$--select-page-border-color: $--border-color-base-focus; +$--select-page-btn-color: #409eff; +$--select-page-btn-border-color: #409eff; +$--select-page-btn-background-color: #FFFFFF; + // icon 字色 $--nz-icon-color: $--color-primary; //icon diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index d2dbb6c9b..1ee6a1472 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -81,7 +81,7 @@ Regex - +