diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index a1f375acd..6a15e34bc 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -214,3 +214,20 @@ td .nz-icon-gear:before{ .el-table::before { background-color: $--border-color-light !important; } +.el-message-box { + background-color: $--background-color-empty !important; + .el-button:nth-of-type(1) { + background-color: $--button-light-hover-background-color; + border: 1px solid $--button-light-border-color; + color: $--button-light-color; + } + .el-button:nth-of-type(1):hover { + background-color: $--button-light-hover-background-color !important; + border: 1px solid $--button-primary-hover-background-color !important; + color: $--button-primary-background-color !important; + } + .el-button.el-button--primary:hover { + background-color: $--button-primary-hover-background-color !important; + opacity: 1 !important; + } +} diff --git a/nezha-fronted/src/assets/css/common/button.scss b/nezha-fronted/src/assets/css/common/button.scss index d5b78e72f..15dbade78 100644 --- a/nezha-fronted/src/assets/css/common/button.scss +++ b/nezha-fronted/src/assets/css/common/button.scss @@ -61,7 +61,7 @@ min-width: 40px; padding: 0 5px; } -.nz-btn.nz-btn-style-light-new { +.nz-btn.nz-btn-style-light { border: 1px solid $--button-light-border-color; color: $--button-light-color; } @@ -81,7 +81,7 @@ color: $--button-light-color; letter-spacing: 0; } -.nz-btn-style-light-new:hover { +.nz-btn-style-light:hover { background-color: $--background-color-empty; border-color: $--color-primary-light-5; color: $--color-primary; @@ -108,23 +108,23 @@ color: $--button-light-hover-color; letter-spacing: 0; } -.nz-btn.nz-btn-style-normal:active:not(.nz-btn-disabled) { /* 橙色按钮active' */ +.nz-btn.nz-btn-style-normal:focus:not(.nz-btn-disabled) { /* 橙色按钮active' */ background: $--button-primary-active-background-color; color: $--button-primary-color; border-color: $--button-primary-active-background-color; } -.nz-btn.nz-btn-style-error:active:not(.nz-btn-disabled) { /* 红色按钮active' */ +.nz-btn.nz-btn-style-error:focus:not(.nz-btn-disabled) { /* 红色按钮active' */ background: #EF7C62; color: $--button-primary-color; border-color: #Eb6D51; } -.nz-btn.nz-btn-style-gray:active:not(.nz-btn-disabled) { /* 灰色按钮active*/ +.nz-btn.nz-btn-style-gray:focus:not(.nz-btn-disabled) { /* 灰色按钮active*/ background: $--button-light-active-background-color; border: 1px solid $--button-light-active-border-color; color: $--button-light-active-color; letter-spacing: 0; } -.nz-btn.nz-btn-style-gray:active:not(.nz-btn-disabled) { /* 浅灰色按钮active*/ +.nz-btn.nz-btn-style-gray:focus:not(.nz-btn-disabled) { /* 浅灰色按钮active*/ background: $--button-light-active-background-color; border: 1px solid $--button-light-active-border-color; color: $--button-light-active-color; diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index c92e893cb..2a3a0c606 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -224,7 +224,7 @@ box-sizing: border-box; font-size: 14px; cursor: pointer; - transition: background-color linear .2s, color linear .1s; + transition:all .2s; } .footer__btn:hover:not(.footer__btn--disabled) { background-color: $--button-primary-hover-background-color; @@ -232,7 +232,7 @@ .footer__btn:focus:not(.footer__btn--disabled) { background-color: $--button-primary-active-background-color; } -.footer__btn--light { +.footer__btn.footer__btn--light { background-color: $--button-light-hover-background-color; border: 1px solid $--button-light-border-color; color: $--button-light-color; @@ -240,7 +240,7 @@ .footer__btn.footer__btn--light:hover:not(.footer__btn--disabled) { background-color: $--button-light-hover-background-color; border: 1px solid $--button-primary-hover-background-color; - color: $--button-primary-background-color; + color: $--button-light-hover-color; } .footer__btn.footer__btn--light:focus:not(.footer__btn--disabled) { background-color: $--button-light-active-background-color; diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 747d9090e..7249e1233 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -78,7 +78,7 @@ outline: none; border-radius: $--button-border-radius; background-color: $--button-icon-background-color; - transition: background-color linear .2s, color linear .1s; + transition:all .2s; color: $--button-icon-color; i { @@ -272,7 +272,7 @@ cursor: pointer; border-radius: $--button-border-radius; outline: none; - transition: background-color linear .2s, color linear .1s; + transition:all .2s; } .table-operation-item.table-operation-item--disable{ border: 1px solid $--border-color-base; @@ -417,7 +417,7 @@ border-right: none; transform: translateX(1px); box-sizing: border-box; - transition: background-color linear .2s, color linear .1s; + transition:all .2s; span { font-size: 14px; diff --git a/nezha-fronted/src/assets/css/components/common/elementSet.scss b/nezha-fronted/src/assets/css/components/common/elementSet.scss index e07574db5..cd3a652c3 100644 --- a/nezha-fronted/src/assets/css/components/common/elementSet.scss +++ b/nezha-fronted/src/assets/css/components/common/elementSet.scss @@ -43,6 +43,9 @@ left: 5px; top: 6px; } +.nz-btn.nz-btn-style-light { + background-color: $--background-color-empty; +} .custom-label { padding: 2px 0 2px 25px; position: relative; 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 d4c89c79d..07658c234 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 @@ -35,7 +35,7 @@ -180deg ); } -.nz-btn-size-normal-new.nz-btn-style-light-new { +.nz-btn-size-normal.nz-btn-style-light { font-size: 12px; color: #3C92F1; i { diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index d168aa19f..787b1d00e 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -88,6 +88,8 @@ $--dashboard-card-header-background-color: $--background-color-empty; /* 10.dropdown */ $--dropdown-menu-box-shadow-color: rgba(8,3,3,0.77); +/* 分页 dropdown */ +$--select-dropdown-background: $--background-color-empty; /* 11.input */ $--input-background-color: $--background-color-base; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index 25da292fa..faf6e5000 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -100,8 +100,8 @@ $--button-primary-active-background-color: mix(#000, $--color-primary, 10%); // button-light用于普通按钮 $--button-light-color: $--color-text-regular; // 灰色按钮字色 -$--button-light-hover-color: $--button-light-color; // 灰色按钮hover字色 -$--button-light-active-color: $--color-primary; // 灰色按钮focus字色 +$--button-light-hover-color: mix(#FFF, $--color-primary, 15%); // 灰色按钮hover字色 +$--button-light-active-color: mix(#000, $--color-primary, 15%); // 灰色按钮focus字色 $--button-light-background-color: $--background-color-base; // 灰色按钮背景色 $--button-light-hover-background-color: $--background-color-empty; // 灰色按钮hover背景色 $--button-light-active-background-color: $--button-light-hover-background-color; // 灰色按钮focus背景色 diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index b73628fb6..84963611e 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -99,12 +99,12 @@ - - diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue index c71b4b36b..e42db76d5 100644 --- a/nezha-fronted/src/components/common/elementSet.vue +++ b/nezha-fronted/src/components/common/elementSet.vue @@ -20,14 +20,14 @@
- -
-