From 018e4fe59e36c1f1a53bd915c447fee85d60d590 Mon Sep 17 00:00:00 2001 From: likexuan Date: Thu, 23 Mar 2023 15:18:03 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2726=20fix:=20Tool-ping=E3=80=81trace?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/rightBox/moduleBox.scss | 2 +- .../assets/css/components/page/tool/ping.scss | 20 +++++-- .../css/components/page/tool/trace.scss | 23 ++++++-- .../src/assets/css/font/demo_index.html | 52 +++++++++++++++++- .../src/assets/css/font/iconfont.css | 14 ++++- nezha-fronted/src/assets/css/font/iconfont.js | 2 +- .../src/assets/css/font/iconfont.json | 14 +++++ .../src/assets/css/font/iconfont.ttf | Bin 85272 -> 85480 bytes .../src/assets/css/font/iconfont.woff | Bin 50040 -> 50144 bytes .../src/assets/css/font/iconfont.woff2 | Bin 42004 -> 42004 bytes nezha-fronted/src/assets/css/nzIcon.css | 14 ++++- .../common/table/tool/pingTable.vue | 4 +- .../common/table/tool/traceTable.vue | 4 +- 13 files changed, 124 insertions(+), 25 deletions(-) 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 59811bb1b..98d7e2a52 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss @@ -270,7 +270,7 @@ .ti-input { border: 1px solid $--border-color-light; .ti-tag.ti-valid { - background-color: $--label-background-color !important;; + background-color: $--background-color-base !important;; color: $--color-text-primary !important;; } .ti-new-tag-input { diff --git a/nezha-fronted/src/assets/css/components/page/tool/ping.scss b/nezha-fronted/src/assets/css/components/page/tool/ping.scss index e71f5a159..b470cd0e9 100644 --- a/nezha-fronted/src/assets/css/components/page/tool/ping.scss +++ b/nezha-fronted/src/assets/css/components/page/tool/ping.scss @@ -22,9 +22,9 @@ overflow-y: auto; box-sizing: border-box; border-radius: 2px; - border: 1px solid $--button-icon-border-color !important; + border: 1px solid $--border-color-light !important; .ti-tag.ti-valid { - background-color: $--label-background-color !important;; + background-color: $--background-color-base !important;; color: $--color-text-primary !important;; } .ti-new-tag-input { @@ -59,11 +59,11 @@ padding: 2px 4px !important; border-radius: 2px !important; border-right: none !important; - background: $--label-background-color; + background: $--background-color-base; margin-right: 5px; color: $--color-text-primary; i{ - font-size: 14px !important; + font-size: 12px !important; } } .btn{ @@ -425,9 +425,19 @@ td.el-table__expanded-cell:hover { #pingTable{ th.el-table__expand-column{ .arrow-expand{ + display: flex; + justify-content: center; i.nz-icon{ cursor: pointer; - padding-left: 2px; + width: 14px; + height: 14px; + border: 1px solid #d9d9d9; + color: $--color-text-regular; + box-shadow: 0 1px 2px 0 rgba(0,0,0,0.06); + display: flex; + align-items: center; + justify-content: center; + font-size: 14px; } } } diff --git a/nezha-fronted/src/assets/css/components/page/tool/trace.scss b/nezha-fronted/src/assets/css/components/page/tool/trace.scss index 0d39d3d02..cc2eb2865 100644 --- a/nezha-fronted/src/assets/css/components/page/tool/trace.scss +++ b/nezha-fronted/src/assets/css/components/page/tool/trace.scss @@ -22,9 +22,9 @@ overflow-y: auto; box-sizing: border-box; border-radius: 2px; - border: 1px solid $--button-icon-border-color !important; + border: 1px solid $--border-color-light !important; .ti-tag.ti-valid { - background-color: $--label-background-color !important;; + background-color: $--background-color-base !important;; color: $--color-text-primary !important;; } .ti-new-tag-input { @@ -59,11 +59,11 @@ padding: 2px 4px !important; border-radius: 2px !important; border-right: none !important; - background: $--label-background-color; + background: $--background-color-base; margin-right: 5px; color: $--color-text-primary; i{ - font-size: 14px !important; + font-size: 12px !important; } } .btn{ @@ -162,9 +162,19 @@ } th.el-table__expand-column{ .arrow-expand{ + display: flex; + justify-content: center; i.nz-icon{ + width: 14px; + height: 14px; cursor: pointer; - padding-left: 2px; + border: 1px solid #d9d9d9; + color: $--color-text-regular; + box-shadow: 0 1px 2px 0 rgba(0,0,0,0.06); + display: flex; + align-items: center; + justify-content: center; + font-size: 14px; } } } @@ -183,6 +193,9 @@ } .el-input-group__append{ color: $--color-text-primary; + background-color: $--right-box-sub-title-background-color; + border: 1px solid $--border-color-light; + border-left: none; } } .pop-tit{ diff --git a/nezha-fronted/src/assets/css/font/demo_index.html b/nezha-fronted/src/assets/css/font/demo_index.html index 4e85edea0..284797175 100644 --- a/nezha-fronted/src/assets/css/font/demo_index.html +++ b/nezha-fronted/src/assets/css/font/demo_index.html @@ -54,6 +54,18 @@