From a18aaab3e55f734034d9649ab8dd4b2d10eed688 Mon Sep 17 00:00:00 2001 From: likexuan Date: Wed, 8 Mar 2023 11:07:47 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2654=20fix:=20=E5=BA=95=E9=83=A8=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=20=E5=88=86=E9=A1=B5=20=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/common/bottomBox/bottomBox.scss | 3 +++ nezha-fronted/src/assets/css/components/common/pagination.scss | 3 +++ nezha-fronted/src/assets/css/themes/src/pagination.scss | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index 6a16eb81e..96d42dca7 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -228,6 +228,9 @@ .bottom-box__top .my-loading-box { height: calc(100% + 20px) !important; } + .my-loading-parent--relative{ + height: calc(100% - 20px) !important; + } } .asset-detail .sub-container .nz-table-list { height: 100%; diff --git a/nezha-fronted/src/assets/css/components/common/pagination.scss b/nezha-fronted/src/assets/css/components/common/pagination.scss index 43a176cf7..e91b6d6ee 100644 --- a/nezha-fronted/src/assets/css/components/common/pagination.scss +++ b/nezha-fronted/src/assets/css/components/common/pagination.scss @@ -60,6 +60,9 @@ .el-pagination .el-pager li.active { background-color: $--color-primary; border-radius: 2px; + &+li{ + border-left: 1px solid rgba(154,154,154,0.20); + } } .el-pager li:hover, .el-pagination .btn-next:hover, .el-pagination .btn-prev:hover { color: $--color-text-regular; diff --git a/nezha-fronted/src/assets/css/themes/src/pagination.scss b/nezha-fronted/src/assets/css/themes/src/pagination.scss index 16ff0eec6..6ff129f78 100644 --- a/nezha-fronted/src/assets/css/themes/src/pagination.scss +++ b/nezha-fronted/src/assets/css/themes/src/pagination.scss @@ -279,7 +279,7 @@ cursor: pointer; } - &.active + li { + &.active+li { border-left: 0; }