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 80e95bad4..9c4b36c5b 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss @@ -189,7 +189,7 @@ .pipeline-title{ font-family: Roboto-Medium; font-size: 14px; - color: $--color-primary; + color: $--color-title-primary; letter-spacing: 0; font-weight: 600; text-transform: Capitalize; diff --git a/nezha-fronted/src/assets/css/components/common/table/alert/alertMessageTable.scss b/nezha-fronted/src/assets/css/components/common/table/alert/alertMessageTable.scss index b465bc6e9..58736892c 100644 --- a/nezha-fronted/src/assets/css/components/common/table/alert/alertMessageTable.scss +++ b/nezha-fronted/src/assets/css/components/common/table/alert/alertMessageTable.scss @@ -1,15 +1,17 @@ -.pointer{ - background: $--color-primary; - border-radius: 2px; - border: none; - width: 40px; - height: 22px; - box-sizing: border-box; - text-align:center; - color: #fff; - font-size: 12px; - margin-right: 20px; -} +//.alert-message-list { +// .pointer{ +// background: $--color-primary; +// border-radius: 2px; +// border: none; +// width: 40px; +// height: 22px; +// box-sizing: border-box; +// text-align:center; +// color: #fff; +// font-size: 12px; +// margin-right: 20px; +// } +//} .alertLabelInfo{ border: 1px solid $--border-color-light; border-bottom: none; diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss index af5001291..0b4b28b69 100644 --- a/nezha-fronted/src/assets/css/components/common/timePicker.scss +++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss @@ -19,9 +19,12 @@ line-height: 30px; } } +.el-dropdown-menu__item:focus, .el-dropdown-menu__item:not(.is-disabled):hover { + color: $--color-primary !important; +} .nz-dashboard-dropdown-bg { background: $--color-primary; - color: #fff !important; + color: $--time-picker-hover-color !important; } .calendar-dropdown-title { white-space: nowrap; 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 a65370d4a..d2900c7c4 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,4 +1,4 @@ -.el-picker-panel,.sp-base.sp-inputs{ +.el-picker-panel,.sp-base.sp-inputs,.sp-base.sp-input{ background: $--input-background-color !important; } .sp-search,.sp-result-area,.sp-pagination { @@ -36,10 +36,10 @@ border: 1px solid $--border-color-light !important; color: $--color-text-regular !important; } -.sp-base.sp-inputs { +.sp-base.sp-inputs,.sp-base.sp-input { border: 1px solid $--border-color-light !important; } -.sp-base.sp-inputs:hover,.sp-base.sp-inputs:focus { +.sp-base.sp-inputs:hover,.sp-base.sp-input:hover,.sp-base.sp-inputs:focus,.sp-base.sp-input:focus { border: 1px solid $--border-color-light-hover !important; } .v-dropdown-container.v-dropdown-no-border { @@ -57,3 +57,21 @@ div.sp-result-area table.sp-table tbody tr.sp-selected td { div.sp-pagination ul li a:hover { color: $--color-text-regular !important; } +div.v-selectpage div.sp-input-container div.sp-input { + color: $--color-text-regular !important; +} +div.v-selectpage div.sp-input-container.sp-open div.sp-input { + border: 1px solid #aaa; + border-radius: 2px; + color: $--color-text-regular !important; +} +.sp-button { + .sp-caret { + color: $--color-text-regular !important; + } +} +.sp-button.open { + .sp-caret { + color: $--color-text-regular !important; + } +} diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index f514aa708..9207a34a4 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -33,6 +33,8 @@ $--color-text-regular: #BEBEBE; $--color-text-secondary: #999998; // 链接字色 $--color-text-link: #3C92F1; +// title 字色 +$--color-title-primary: $--color-text-primary; /* 4.边框色 */ // 普通边框色 @@ -150,6 +152,9 @@ $--value-background-color: $--background-color-empty; $--value-input-background-color: $--background-color-base; $--value-color: $--table-header-font-color; +// time picker +$--time-picker-hover-color: #FFFFFF; + /* 13.panel */ $--chart-title-hover-background-color: #323238; $--chart-box-border-color: $--border-color-light; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index 7c0228e9c..d1ea09e32 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -33,6 +33,8 @@ $--color-text-regular: #666665; $--color-text-secondary: #999998; // 链接字色 $--color-text-link: #3C92F1; +// title 字色 +$--color-title-primary: $--color-primary; /* 4.边框色 */ // 普通边框色(覆盖element-ui内置变量) @@ -148,6 +150,9 @@ $--value-background-color: #5C6BC0; $--value-color: #FFFFFF; $--value-input-background-color: $--value-color; +// time picker +$--time-picker-hover-color: $--value-color; + /* 13.panel */ $--chart-title-hover-background-color: $--background-color-1; $--chart-box-border-color: $--border-color-light; diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index 85a3a6222..5b9378a7a 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -427,7 +427,7 @@ > - = + =