From f3958862a2c8b4e009f0bcb9629cc025abe23bdb Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Thu, 18 Nov 2021 15:15:19 +0800 Subject: [PATCH] =?UTF-8?q?style:=20Asset=20=E4=B8=BB=E9=A2=98=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=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 | 2 +- .../src/assets/css/common/rightBoxCommon.scss | 22 ++++++++++++------- .../src/assets/css/common/tableCommon.scss | 7 ++++++ .../common/detailView/list/common.scss | 3 --- .../common/rightBox/asset/assetBox.scss | 1 + .../src/assets/css/themes/theme-dark.scss | 6 +++++ .../src/assets/css/themes/theme-light.scss | 6 +++++ .../common/rightBox/asset/assetBox.vue | 2 +- 8 files changed, 36 insertions(+), 13 deletions(-) diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 49e7900f8..a0155fd7a 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -214,7 +214,7 @@ td .nz-icon-gear:before{ .el-tree { background-color: $--background-color-empty !important; } -.el-table::before { +.el-table::before,.el-table__fixed-right::before { background-color: $--border-color-light !important; } .el-message-box { diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 8e9bf19f3..06eef0f8d 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -165,6 +165,11 @@ .form__labels-label { display: flex; justify-content: space-between; + .form__labels-label__span { + i { + color: $--asset-icon-color; + } + } } } } @@ -172,12 +177,12 @@ margin-bottom: 20px; width: 300px; height: 28px; - border: 1px solid $--color-primary-light-7; + border: 1px solid $--asset-border-color; border-radius: $--border-radius-small; - background-color: $--color-primary-light-9; + background-color: $--asset-background-color-button; i { - color: $--color-primary; + color: $--asset-icon-color; } } .form__flex-container { @@ -272,11 +277,6 @@ .right-box-dropdown-top { min-width: 625px; } -.limit-height .el-cascader-menu { - max-height: 200px; - overflow: auto; -} - .form-items--half-width-group { display: flex; justify-content: space-between; @@ -358,3 +358,9 @@ } } } +.el-picker-panel { + background: $--background-color-empty !important; +} +.el-date-table td.today span { + color: $--button-primary-color !important; +} diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 7249e1233..73a13c171 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -274,6 +274,9 @@ outline: none; transition:all .2s; } + .el-dropdown { + border: 1px solid $--border-color-light; + } .table-operation-item.table-operation-item--disable{ border: 1px solid $--border-color-base; background-color: $--border-color-base; @@ -513,3 +516,7 @@ height: 100%; cursor: col-resize; } + +::-webkit-scrollbar-corner { + background-color: $--background-color-empty; +} diff --git a/nezha-fronted/src/assets/css/components/common/detailView/list/common.scss b/nezha-fronted/src/assets/css/components/common/detailView/list/common.scss index 65f6afcde..8d195d20e 100644 --- a/nezha-fronted/src/assets/css/components/common/detailView/list/common.scss +++ b/nezha-fronted/src/assets/css/components/common/detailView/list/common.scss @@ -45,9 +45,6 @@ font-weight: 400; } } -.selected{ - background: $--background-color-base; -} .colorEF7458{ color: $--color-danger; } diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/asset/assetBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/asset/assetBox.scss index 07658c234..a00767a43 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/asset/assetBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/asset/assetBox.scss @@ -42,3 +42,4 @@ font-size: 12px; } } + diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index 2fb4a4141..7e1a8d2e6 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -2,6 +2,8 @@ /* 1.主色(覆盖element-ui内置变量) */ $--color-primary: #FA901C; +/* AssetBOX button 背景色 */ +$--asset-background-color-button: #222329; /* 2.背景色 */ // 空白背景色 @@ -126,6 +128,10 @@ $--button-icon-border-color: $--border-color-light; // 边框色 $--button-icon-hover-border-color: $--button-icon-border-color; // hover边框色 $--button-icon-active-border-color: $--color-text-primary; // focus边框色 +/* Asset */ +$--asset-icon-color: $--button-primary-color; //icon +$--asset-border-color: $--border-color-light; // border + /* 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 9b324d33f..1edadc69f 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -2,6 +2,8 @@ /* 1.主色(覆盖element-ui内置变量) */ $--color-primary: #FA901C; +/* AssetBOX button 背景色 */ +$--asset-background-color-button: #FFF4E8; /* 2.背景色 */ // 空白背景色 @@ -124,6 +126,10 @@ $--button-icon-border-color: $--border-color-base; // 边框色 $--button-icon-hover-border-color: $--border-color-base; // hover边框色 $--button-icon-active-border-color: mix(#FFF, $--color-primary, 10%); // focus边框色 +/* Asset */ +$--asset-icon-color: $--color-primary; //icon +$--asset-border-color: mix(#FFF, $--color-primary, 60%); // border + /* 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/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index 4ed646105..153745994 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -85,7 +85,7 @@
{{label.name}}
- +