From f50e9682806159df7d32838a21ba4ce319e6af6d Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Thu, 25 Nov 2021 18:16:47 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F?= =?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 | 12 +++++++ .../src/assets/css/common/rightBoxCommon.scss | 3 ++ .../src/assets/css/common/tableCommon.scss | 1 + .../common/bottomBox/bottomBox.scss | 6 +--- .../common/rightBox/editEndpointBoxNew.scss | 33 +++++++++++-------- .../components/common/rightBox/moduleBox.scss | 23 +++++++------ .../css/components/page/dashboard/panel.scss | 5 +++ .../page/monitor/project/project.scss | 1 + .../common/rightBox/editEndpointBoxNew.vue | 2 +- 9 files changed, 54 insertions(+), 32 deletions(-) diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 574ed0c63..4c4f86111 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -284,6 +284,18 @@ td .nz-icon-gear:before{ .el-date-picker__time-header { border-bottom: 1px solid $--picker-page-border-color !important; } +.el-input-group.el-input-group--prepend,.query-input-inactive.el-input { + .el-input-group__prepend { + background-color: $--background-color-empty; + border: 1px solid $--border-color-light; + .el-input__inner:focus { + border-color: $--border-color-light-hover; + } + } + .el-input__inner:hover { + border-color: $--border-color-light-hover; + } +} //.editor-core { // p { // color: $--color-text-regular; diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 4ee0dee5b..982c1d4d0 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -16,6 +16,9 @@ padding-left: 32px; } } + .el-form-item__label { + line-height: 16px !important; + } } .right-box__header { diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index d6ccd8e2e..e6d923fe5 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -323,6 +323,7 @@ .el-table__body-wrapper { overflow: auto; background-color: $--table-body-background-color; + height: 100% !important; } .el-table__fixed-body-wrapper { top: 42px !important; 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 bd1e5ad61..f1847611f 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -84,6 +84,7 @@ .nz-table2 { box-sizing: border-box; padding: 0; + height: 100%; } } } @@ -148,8 +149,3 @@ .symbol-select .el-input__inner { padding-left: 8px; } -.list-page.endpoint,.list-page.asset { - .nz-table2 { - height: 100%; - } -} diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/editEndpointBoxNew.scss b/nezha-fronted/src/assets/css/components/common/rightBox/editEndpointBoxNew.scss index 2937f2758..ab7b6debc 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/editEndpointBoxNew.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/editEndpointBoxNew.scss @@ -53,8 +53,8 @@ padding-left: 0; } .el-tabs__item{ - width: 90px; - padding: 0; + min-width: 90px; + padding: 0 10px; text-align: center; } .el-tabs__item.is-active{ @@ -96,13 +96,17 @@ border-radius: 2px; height: 140px; position: relative; - margin-top: 10px; - padding: 10px 0 10px 15px; + margin: 10px 0 16px 0; + padding: 10px 0px 10px 0; width:100%; - margin-left: 0; - pre{ - max-height: 300px; - min-height: 100px; + } + .configs-copy-value { + pre { + color: $--color-text-primary; + padding: 15px; + } + i { + color: $--color-text-regular; } } .configs-copy-value .copy-value-content{ @@ -136,9 +140,10 @@ position: absolute; right: 20px; top: 15px; - background: rgba(236,127,102,0.1); + background: $--background-color-copy; padding: 2px 6px; - color: #EC7F66; + border: 1px solid $--span-nz-icon-border-color; + color: $--nz-icon-color; } .endpoint-title{ border: 1px solid $--border-color-light; @@ -167,13 +172,13 @@ } } .value-mapping-add { - background: rgba(250,144,28,0.1); - border: 1px solid #FFE0BD; margin-bottom: 10px; height: 24px; - line-height: 24px; - color: $--color-primary; + line-height: 23px; box-sizing: border-box; + background: $--background-color-copy; + border: 1px solid $--span-nz-icon-border-color; + color: $--nz-icon-color; } #module-box-relabel .vue-tags-input{ max-width: unset; 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..dee3763a3 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss @@ -98,10 +98,18 @@ border-radius: 2px; height: 140px; position: relative; - margin-top: 10px; - padding: 10px 0px 10px 15px; + margin: 10px 0 16px 0; + padding: 10px 0px 10px 0; width:100%; - margin-left: 0px; + } + .configs-copy-value { + pre { + color: $--color-text-primary; + padding: 15px; + } + i { + color: $--color-text-regular; + } } .configs-copy-value .copy-value-content{ position: absolute; @@ -195,15 +203,6 @@ text-transform: Capitalize; } } - .configs-copy-value { - pre { - color: $--color-text-primary; - padding: 15px; - } - i { - color: $--color-text-regular; - } - } } .sub-label { padding-right: 15px; diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss index f99735a47..ff89a2f53 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss @@ -6,6 +6,11 @@ display: flex; flex-direction:column; } +.panel.list-page { + .table-list { + height: calc(100% - 58px); + } +} .panel .el-table { border-radius: 5px; 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 61833643d..5aed726e7 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 @@ -49,6 +49,7 @@ } .main-container{ padding-right: 0 !important; + width: calc(100% - 10px); } } .project-calendar .el-input__inner { diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue index fe15c0dea..8d302252a 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue @@ -561,7 +561,7 @@ {{$t('overall.preview')}}
-
+ 
{{configsCopyValue}}