summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshizhendong <[email protected]>2019-11-06 18:05:57 +0800
committershizhendong <[email protected]>2019-11-06 18:05:57 +0800
commitaf05a03b09bd46f03cdc2444b025f4d33dd0acb0 (patch)
tree0ce03fc8752a78af87112256ef9f35868ae2ed80
parent1a5717fb5df581e2517e12ea706863ba91082383 (diff)
parent10c80ff22358327c9c38fae872090e1b55ff1c1d (diff)
Merge remote-tracking branch 'origin/develop' into develop
-rw-r--r--nezha-admin/src/main/resources/statics/css/main.css2
-rw-r--r--nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/nezha-admin/src/main/resources/statics/css/main.css b/nezha-admin/src/main/resources/statics/css/main.css
index aed7cf1d..764364fe 100644
--- a/nezha-admin/src/main/resources/statics/css/main.css
+++ b/nezha-admin/src/main/resources/statics/css/main.css
@@ -58,7 +58,7 @@ html { overflow-x:hidden; }
position: absolute;
line-height: 34px;
}
-#deteType .input-unit {
+.input-unit {
left: 100px;
color: #888888;
}
diff --git a/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html b/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
index f35bb110..eb4e11fd 100644
--- a/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
+++ b/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
@@ -211,7 +211,7 @@
<script type="text/x-template" id="detectMata">
<div>
<div class="meta-win_item" v-id:[metaDomIdKey]="index">
- <span v-show="deteMeta.delFlag=='1'" style="display: inline-block" @click="recSelf"><i class="fa fa-undo"></i>&nbsp;&nbsp;</span>
+ <span v-show="deteMeta.delFlag=='1'" style="display: inline-block;cursor:pointer;" @click="recSelf"><i class="fa fa-undo"></i>&nbsp;&nbsp;</span>
<div class="meta-win_item_name" style="display: inline-block"
:class="{'meta-win_item_name_unpass':deteMeta.passFlag!=null&&deteMeta.passFlag!=undefined&&!deteMeta.passFlag,'meta-win_item_name_del':deteMeta.delFlag=='1'}">{{deteMeta.name}}</div>
<div style="text-align:right;">