diff --git a/nezha-fronted/src/assets/stylus/index.scss b/nezha-fronted/src/assets/stylus/index.scss index 1e8607b40..342a74560 100644 --- a/nezha-fronted/src/assets/stylus/index.scss +++ b/nezha-fronted/src/assets/stylus/index.scss @@ -19,6 +19,7 @@ $btn-light-shadow: 0 0 1px 1px rgba(162,162,162,0.50); //灰色按钮边框阴 $pop-box-shadow: 0 0 12px 0 rgba(0,0,0,0.2); $box-title-color: #333; //弹框标题字体颜色 +$box-label-color: #666; //弹框label字色 $content-left-text-color: #666; //左侧菜单默认字色 diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 8aed3f7d8..4bbb6df57 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1,6 +1,6 @@ [v-cloak] { - display: none; + display: none !important; } body { height: 100%; @@ -606,6 +606,9 @@ li{ .right-box-add-asset, .right-box-add-chart { width: 550px; } +.right-box-chart .el-input__inner, .right-box-chart input { + background-color: white; +} .right-box-add-endpoint { width: 840px; } @@ -730,9 +733,12 @@ li{ position: absolute; right: 0; } -.config-dropdown, .chart-box-dropdown { +.config-dropdown, .chart-box-dropdown, .metric-dropdown { z-index: 2950 !important; } +.chart-box-dropdown { + width: 519px; +} .config-dropdown-btn i { font-size: 12px; } @@ -764,13 +770,13 @@ li{ } .right-box-form .el-form-item .el-form-item__label { padding: 0; - font-size: 16px; - color: black; + font-size: 14px; + color: #666; } .right-box-form .el-form-item.metric-title-position .el-form-item__label { padding: 0; font-size: 14px; - color: #666; + color: $box-label-color; } .pop-item-wider .right-box-form .el-form-item .el-form-item__label { font-size: 14px; @@ -779,9 +785,13 @@ li{ .right-box-form-left.right-box-form .el-form-item .el-form-item__label { padding: 0 20px 0 0; font-size: 14px; - color: black; + color: $box-label-color; line-height: 34px; } +.right-child-box-title, .asset-sub-title, .label-center, .metric-title-label { + font-size: 14px; + color: $box-label-color; +} .right-box-form .el-form-item__content { line-height: 32px; } @@ -867,6 +877,7 @@ li{ } .right-box-form-content .right-box-row-with-btn { width: calc(100% - 37px); + vertical-align: middle; } .right-box-form-content .right-box-row-with-btn.el-select--mini, .right-box-form-content .right-box-row-with-btn.el-cascader--mini { width: calc(100% - 33px); diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 3bbad4fb7..823da3fac 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -32,10 +32,10 @@ --> -
+
- + diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index 5423bc50e..1563a465d 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -25,7 +25,7 @@ diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index a5f338ff1..ab7ee7d27 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -56,7 +56,7 @@ -
+