diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 07652fe1a..6e782a2e5 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -449,7 +449,7 @@ } } } -.endpoint-query-metrics.chart-fullscreen.nz-dialog { +.endpoint-query-metrics.chart-fullscreen.nz-dialog,.recordRules-query-metrics.chart-fullscreen.nz-dialog { .chart-screen-header .chart-header__tools #browser-go { margin-left: 5px; } @@ -634,6 +634,9 @@ .chart-label{ color: $--color-text-primary; } +.chart-label-text{ + fill: $--color-text-primary; +} .tickTest{ font-size: 12px; color: $--color-text-primary; diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index f4b46fe46..90a1ebd90 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -97,21 +97,21 @@ } } .nz-btn-group { - #endpoint-query-changetime:hover { + #endpoint-query-changetime,#recordRules-query-changetime:hover { border: 1px solid $--asset-label-btn-border-color; } .nz-btn.nz-btn-size-normal.nz-btn-style-light.control-icon-unchecked:hover { border: 1px solid $--asset-label-btn-border-color; z-index: 2; } - .nz-btn.nz-btn-size-normal.nz-btn-style-light.control-icon-unchecked { + .nz-btn.nz-btn-size-normal.nz-btn-style-light.control-icon-unchecked,.nz-btn.nz-btn-size-normal.nz-btn-style-light.control-icon-checked { margin-right: -1px; } .project-calendar.nz-input-group-middle { border-left: 0; border-right: 0; - border-top: 1px solid $--border-color-base; - border-bottom: 1px solid $--border-color-base; + border-top: 1px solid $--border-color-light; + border-bottom: 1px solid $--border-color-light; display: flex; align-items: center; justify-content: center; @@ -240,6 +240,16 @@ border: 0 !important; box-shadow: 0 0 0px 0px rgba(0, 0, 0, 0); } +.recordRules-query .sub-container .nz-table-list { + height: 100%; +} +.recordRules-query .bottom-data-list .nz-btn-group .nz-input-group-middle input { + border-right: 0 !important; +} +.recordRules-query .bottom-data-list .nz-btn-group.nz-btn-group-size-normal.nz-btn-group-light { + border: 0 !important; + box-shadow: 0 0 0px 0px rgba(0, 0, 0, 0); +} /* end--二级顶部工具栏*/ .log-no-data { diff --git a/nezha-fronted/src/assets/css/components/common/table/special/endpointQuery.scss b/nezha-fronted/src/assets/css/components/common/table/special/endpointQuery.scss index e8b10b9dd..bf302a5e6 100644 --- a/nezha-fronted/src/assets/css/components/common/table/special/endpointQuery.scss +++ b/nezha-fronted/src/assets/css/components/common/table/special/endpointQuery.scss @@ -1,4 +1,4 @@ -.endpoint-query-tab { +.endpoint-query-tab,.recordRules-query-tab { .el-dialog__body { height: calc(100% - 48px) !important; padding-bottom: 0 !important; @@ -31,4 +31,4 @@ cursor: not-allowed; background-color: #f4f4f5; } -} +} \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/components/common/threshold/threshold.scss b/nezha-fronted/src/assets/css/components/common/threshold/threshold.scss index 76145b094..49c28408b 100644 --- a/nezha-fronted/src/assets/css/components/common/threshold/threshold.scss +++ b/nezha-fronted/src/assets/css/components/common/threshold/threshold.scss @@ -1,4 +1,5 @@ .rich-text-editor { + color: $--color-text-regular; .ql-toolbar { border: 1px solid $--border-color-light; } @@ -11,4 +12,11 @@ color: $--color-text-regular; } } + .ql-tooltip{ + line-height: normal; + } + .ql-editing input{ + color: $--color-text-regular; + } + } diff --git a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss index 983c41fe2..f5e099619 100644 --- a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss +++ b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss @@ -97,6 +97,7 @@ height: 23px; } + .date-pick-group { display: flex; align-items: center; diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index be6a38981..3ad324907 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1617,4 +1617,4 @@ li { } .hover .user-username{ color: $--color-primary; -} +} \ No newline at end of file diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue index 7b6d46d22..7317b9eee 100644 --- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue +++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue @@ -7,12 +7,12 @@ :close-delay=10 trigger="hover" popper-class="chart-error-popper"> -