gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改导入成功页面的按钮

Browse Source
This commit is contained in:
zhangyu
2020-10-27 11:27:16 +08:00
parent 09432697a2
commit deb6575a24
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/assets/stylus/index.scss
View File

@@ -21,6 +21,11 @@ $btn-normal-background-color-hover-new:#FE9F37;//新橙色按钮hover背景颜
$btn-normal-background-color-active-new:#F37F00;//新橙色按钮active背景颜色 $btn-normal-background-color-active-new:#F37F00;//新橙色按钮active背景颜色
$btn-normal-txt-color-new: #fff; //新橙色按钮字体颜色 $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-new:rgba(0,0,0,0.15);//新灰色按钮背景颜色
$btn-light-border-color-hover-new:rgba(250,144,28,0.3);//新灰色按钮hover背景颜色 $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背景颜色 $btn-light-txt-color-hover-new:rgba(250,144,28,1);//新灰色按钮hover背景颜色

18
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -270,6 +270,12 @@ li{
//box-shadow: $btn-normal-shadow; //box-shadow: $btn-normal-shadow;
border: 0px; 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 { /* 新版浅色按钮 */ .nz-btn.nz-btn-style-light-new { /* 新版浅色按钮 */
background: #fff; background: #fff;
border: 1px solid $btn-light-border-color-new; border: 1px solid $btn-light-border-color-new;
@@ -283,6 +289,12 @@ li{
//box-shadow: $btn-normal-shadow; //box-shadow: $btn-normal-shadow;
border: 0px; 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 */ .nz-btn.nz-btn-style-light-new:hover:not(.nz-btn-disabled) { /* 新版浅色按钮hover */
border: 1px solid $btn-light-border-color-hover-new; border: 1px solid $btn-light-border-color-hover-new;
color: $btn-light-txt-color-hover-new; color: $btn-light-txt-color-hover-new;
@@ -295,6 +307,12 @@ li{
//box-shadow: $btn-normal-shadow; //box-shadow: $btn-normal-shadow;
border: 0px; 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*/ .nz-btn.nz-btn-style-light-new:active:not(.nz-btn-disabled) { /* 新版浅色按钮active*/
border: 1px solid $btn-light-border-color-active-new; border: 1px solid $btn-light-border-color-active-new;
color: $btn-light-border-color-active-new; color: $btn-light-border-color-active-new;

8
nezha-fronted/src/components/common/exportXLSX.vue
View File

@@ -81,12 +81,12 @@
</div> </div>
<div slot="footer" class="footer"> <div slot="footer" class="footer">
<div class="el-message-box__btns"> <div class="el-message-box__btns">
<button @click="rollbackImport" class="el-button el-button--default el-button--small"> <button @click="rollbackImport" class="nz-btn nz-btn-size-normal-new nz-btn-style-error-new">
<span>{{$t('overall.rollbackImport')}}</span> <span>{{$t('overall.rollbackImport')}}</span>
</button> </button>
<button @click="closeDialog" class="el-button el-button--default el-button--small"> <!--<button @click="closeDialog" class="el-button el-button&#45;&#45;default el-button&#45;&#45;small">-->
<span>{{$t('overall.cancel')}}</span> <!--<span>{{$t('overall.cancel')}}</span>-->
</button> <!--</button>-->
</div> </div>
</div> </div>
</div> </div>

2
nezha-fronted/src/components/common/language/en.js
View File

@@ -58,7 +58,7 @@ const en = {
importExcel:'Import', importExcel:'Import',
importExcelLower:'import', importExcelLower:'import',
exportExcelLower:'export', exportExcelLower:'export',
rollbackImport:'rollback', rollbackImport:'Rollback',
exportCur:'Current page', exportCur:'Current page',
exportAll:'All', exportAll:'All',
importFile:'Please upload file', importFile:'Please upload file',