diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 2d3446880..53a0cb684 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -180,6 +180,13 @@ html { } /* end--按钮组件*/ +/*table提示样式*/ +.el-tooltip__popper.is-light { + border: 1px solid #EBEEF5; + color: #606266; + box-shadow: 0 2px 12px 0 rgba(0,0,0,.1); +} + /* begin--el-input扩展 */ .input-x-mini-22 .el-input__inner { height: 22px; diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue index 6f263fdfc..dd366bf9d 100644 --- a/nezha-fronted/src/components/common/pagination.vue +++ b/nezha-fronted/src/components/common/pagination.vue @@ -7,7 +7,7 @@ @next-click="next" @current-change="current" :current-page="pageObj.pageNo" - :page-sizes="[20, 50, 100, 300]" + :page-sizes="[20, 50, 100]" :page-size="20" layout="total, prev, pager, next,sizes,jumper" :total="this.pageObj.total" @@ -65,7 +65,7 @@ export default { } .el-pager li, .el-pagination .btn-next, .el-pagination .btn-prev { - margin:5px 10px 0px 10px; + margin:5px 5px 0px 5px; padding: 0 4px; font-size: 13px; min-width: 20px; @@ -78,6 +78,12 @@ export default { border-radius: 2px; border-radius: 2px; } + .el-pagination .el-pager li.btn-quicknext, .el-pager li.btn-quickprev { + line-height: 20px; + } + .el-pagination .el-pager .more::before { + line-height: 20px; + } .el-pager li.number{ font-family: NotoSansSC-Regular; color: #666666; diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 079501b7d..07ede8f2a 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -2,409 +2,423 @@ .config { height: 100%; } - .top-tools #alert-add .top-tool-btn-txt .nz-icon{ + + .top-tools #alert-add .top-tool-btn-txt .nz-icon { display: inline-block; font-size: 12px; - margin-right:6px; + margin-right: 6px; }