diff --git a/nezha-fronted/src/assets/css/components/common/configSync.scss b/nezha-fronted/src/assets/css/components/common/configSync.scss index f78cbf482..c6d1fec08 100644 --- a/nezha-fronted/src/assets/css/components/common/configSync.scss +++ b/nezha-fronted/src/assets/css/components/common/configSync.scss @@ -1,4 +1,8 @@ .configSync-dialog{ + .el-dialog__title{ + font-size: 14px; + font-weight: 600; + } .dialog-header { margin-bottom: 10px; word-wrap: break-word; @@ -69,20 +73,17 @@ } } } + .el-dialog__footer{ + padding-top: 20px; + } .sync-select-list{ padding-top: 5px; - padding-bottom: 15px; .sync-select-item{ margin-top: 6px; - .el-checkbox__input.is-checked+.el-checkbox__label{ + .el-checkbox__label{ color: $--checkbox-font-color !important; + padding-left: 6px; } } } - .el-dialog__footer{ - .footer__btn{ - margin-right: 0; - margin-left: 10px; - } - } } \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/components/common/deleteButton.scss b/nezha-fronted/src/assets/css/components/common/deleteButton.scss index 1d6be9cd2..e0c57083b 100644 --- a/nezha-fronted/src/assets/css/components/common/deleteButton.scss +++ b/nezha-fronted/src/assets/css/components/common/deleteButton.scss @@ -1,12 +1,9 @@ -.batch-delete-footer{ - box-shadow: none !important; - height: auto !important; - display: flex; - justify-content: space-between !important; - flex-direction: row-reverse; -} .batch-delete-dialog{ transition: all 0.3s; + .el-dialog__title{ + font-size: 14px; + font-weight: 600; + } .dialog-header { margin-bottom: 10px; word-wrap: break-word; @@ -27,80 +24,97 @@ .el-dialog__body { padding: 0 20px; } - .tree-header{ - background: $--background-color-base; - padding: 7px 10px 7px 0px; - font-weight: 600; - .batch-delete-item-id, .batch-delete-item-name{ + .batch-delete-tree{ + border: 1px solid $--border-color-light; + .tree-header{ + background: $--background-color-base; + padding: 7px 10px 7px 0px; font-weight: 600; + margin-bottom: 0 !important; + .batch-delete-item-id, .batch-delete-item-name{ + font-weight: 600; + } } - } - .tree-body{ - //min-height: 160px; - //max-height: 220px; - height: 160px; - overflow-y: auto; - } - .tree-body-item{ - display: flex; - width: 100%; - font-size: 14px; - color: $--color-text-primary; - font-weight: 400; - margin-bottom: 10px; - padding-left: 10px; - box-sizing: border-box; - line-height: 22px; - .nz-icon{ + .tree-body{ + box-sizing: content-box; + padding-top: 10px; + height: 160px; + overflow-y: auto; + } + .tree-body-item{ + display: flex; + width: 100%; + font-size: 14px; + color: $--color-text-primary; + font-weight: 400; + margin-bottom: 10px; + padding-left: 10px; + box-sizing: border-box; + line-height: 22px; + .nz-icon{ + vertical-align: middle; + } + .batch-delete-item-id{ + margin-left: 28px; + margin-right: 28px; + width: 100px; + transition: all 0.3s; + flex-shrink: 0; + } + .batch-delete-item-name{ + margin-left: 14px; + flex: 1; + flex-shrink: 0; + width: calc(100% - 190px); + .tree-body-children:nth-of-type(1){ + margin-top: 10px; + } + transition: all 0.3s; + } + } + .tree-body-children{ + padding-left: 25px; + display: block; + } + .batch-delete-item-text{ + display: inline-block; + width: calc(100% - 45px); vertical-align: middle; } - .batch-delete-item-id{ - margin-left: 28px; - margin-right: 28px; - width: 100px; - transition: all 0.3s; - flex-shrink: 0; - } - .batch-delete-item-name{ - margin-left: 14px; - flex: 1; - flex-shrink: 0; - width: calc(100% - 190px); - .tree-body-children:nth-of-type(1){ - margin-top: 10px; + .el-checkbox-group{ + font-size: 14px; + .el-checkbox__label{ + display: none; } + } + .nz-icon-caret-right{ + display:inline-block; + transition: all 0.3s; + color: $--border-color-base-focus; + } + .rotate90 { + display:inline-block; + transform: rotate(90deg); transition: all 0.3s; } } - .tree-body-children{ - padding-left: 25px; - display: block; + .el-dialog__footer{ + padding-top: 20px; } - .batch-delete-item-text{ - display: inline-block; - width: calc(100% - 45px); - vertical-align: middle; - } - .el-checkbox-group{ - font-size: 14px; + .forceDelete-check{ + padding-top: 10px; .el-checkbox__label{ - display: none; + color: $--checkbox-font-color !important; + padding-left: 6px; } } - .nz-icon-caret-right{ - display:inline-block; - transition: all 0.3s; - color: $--border-color-base-focus; - } - .rotate90 { - display:inline-block; - transform: rotate(90deg); - transition: all 0.3s; - } - .check-title{ - color: $--color-text-regular; - vertical-align: middle; - } +} +.batch-delete-footer{ + box-shadow: none !important; + height: auto !important; + display: flex; + justify-content: space-between !important; + flex-direction: row-reverse; } .delete-button{ margin-right: 10px; 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 07658c234..07e972381 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 @@ -36,7 +36,6 @@ ); } .nz-btn-size-normal.nz-btn-style-light { - font-size: 12px; color: #3C92F1; i { font-size: 12px; diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 5552cce36..620b97a1a 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1277,8 +1277,9 @@ li { .import-select-list{ .import-select-item{ margin-top: 6px; - .el-checkbox__input.is-checked+.el-checkbox__label{ + .el-checkbox__label{ color: $--checkbox-font-color !important; + padding-left: 6px; } } } diff --git a/nezha-fronted/src/components/common/configSync.vue b/nezha-fronted/src/components/common/configSync.vue index 984ea92f4..b6e33d867 100644 --- a/nezha-fronted/src/components/common/configSync.vue +++ b/nezha-fronted/src/components/common/configSync.vue @@ -43,8 +43,8 @@
- - + +
diff --git a/nezha-fronted/src/components/common/deleteButton.vue b/nezha-fronted/src/components/common/deleteButton.vue index f29ed4029..96d57d7a6 100644 --- a/nezha-fronted/src/components/common/deleteButton.vue +++ b/nezha-fronted/src/components/common/deleteButton.vue @@ -13,11 +13,11 @@ ref="batchDeleteDialog" id="batch-delete-dialog" class="batch-delete-dialog" - :title="$t('deleteButton.confirm')" + :title="$t('overall.hint')" v-if="dialogVisible" :visible.sync="dialogVisible" @close='handleClose' - width="660px" + width="580px" :modal-append-to-body="true" :append-to-body="true" > @@ -36,7 +36,7 @@ {{$t('batch.finish', {title: $t(deleteTitle)})}} -
+
ID
@@ -71,17 +71,14 @@
+
+ {{$t('batch.forceDelete')}} +
- -
- - -
-
- - {{$t('batch.forceDelete')}} -
-
+
diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue index 1c1f0bb32..064d16495 100644 --- a/nezha-fronted/src/components/page/config/mibBrowser.vue +++ b/nezha-fronted/src/components/page/config/mibBrowser.vue @@ -187,7 +187,7 @@
- +