diff --git a/nezha-fronted/src/assets/stylus/index.scss b/nezha-fronted/src/assets/stylus/index.scss index ea1bd9bb0..1a312e2a0 100644 --- a/nezha-fronted/src/assets/stylus/index.scss +++ b/nezha-fronted/src/assets/stylus/index.scss @@ -21,6 +21,11 @@ $btn-normal-background-color-hover-new:#FE9F37;//新橙色按钮hover背景颜 $btn-normal-background-color-active-new:#F37F00;//新橙色按钮active背景颜色 $btn-normal-txt-color-new: #fff; //新橙色按钮字体颜色 +$btn-error-background-color-new:#EF7C62;//新红色按钮背景颜色 +$btn-error-background-color-hover-new:#F38b73;//新红色按钮hover背景颜色 +$btn-error-background-color-active-new:#Eb6D51;//新红色按钮active背景颜色 +$btn-error-txt-color-new: #fff; //新红色按钮字体颜色 + $btn-light-border-color-new:rgba(0,0,0,0.15);//新灰色按钮背景颜色 $btn-light-border-color-hover-new:rgba(250,144,28,0.3);//新灰色按钮hover背景颜色 $btn-light-txt-color-hover-new:rgba(250,144,28,1);//新灰色按钮hover背景颜色 diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 2de25dcaa..91a2cd80a 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -270,6 +270,12 @@ li{ //box-shadow: $btn-normal-shadow; border: 0px; } +.nz-btn.nz-btn-style-error-new { /* 新版红色色按钮 */ + background: $btn-error-background-color-new; + color: $btn-error-txt-color-new; + //box-shadow: $btn-normal-shadow; + border: 0px; +} .nz-btn.nz-btn-style-light-new { /* 新版浅色按钮 */ background: #fff; border: 1px solid $btn-light-border-color-new; @@ -283,6 +289,12 @@ li{ //box-shadow: $btn-normal-shadow; border: 0px; } +.nz-btn.nz-btn-style-error-new:hover:not(.nz-btn-disabled) { /* 新版红色按钮hover */ + background: $btn-error-background-color-hover-new; + color: $btn-error-txt-color-new; + //box-shadow: $btn-normal-shadow; + border: 0px; +} .nz-btn.nz-btn-style-light-new:hover:not(.nz-btn-disabled) { /* 新版浅色按钮hover */ border: 1px solid $btn-light-border-color-hover-new; color: $btn-light-txt-color-hover-new; @@ -295,6 +307,12 @@ li{ //box-shadow: $btn-normal-shadow; border: 0px; } +.nz-btn.nz-btn-style-error-new:active:not(.nz-btn-disabled) { /* 新版红色按钮active' */ + background: $btn-error-background-color-active-new; + color: $btn-error-txt-color-new; + //box-shadow: $btn-normal-shadow; + border: 0px; +} .nz-btn.nz-btn-style-light-new:active:not(.nz-btn-disabled) { /* 新版浅色按钮active*/ border: 1px solid $btn-light-border-color-active-new; color: $btn-light-border-color-active-new; diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue index 9e7d35773..390d98807 100644 --- a/nezha-fronted/src/components/common/exportXLSX.vue +++ b/nezha-fronted/src/components/common/exportXLSX.vue @@ -81,12 +81,12 @@ diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index adfba1ce7..261ccab5b 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -58,7 +58,7 @@ const en = { importExcel:'Import', importExcelLower:'import', exportExcelLower:'export', - rollbackImport:'rollback', + rollbackImport:'Rollback', exportCur:'Current page', exportAll:'All', importFile:'Please upload file',