summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchenjinsong <[email protected]>2019-11-14 15:16:07 +0800
committerchenjinsong <[email protected]>2019-11-14 15:16:07 +0800
commitc8737d63ce7bc6ff7fad482cc901ba93fbb4e06b (patch)
tree735f0578a6590e3c159d4aec9c8cd7ee3f545712
parent1e8d69f83ef368f7d2771aee10df7a6a82fc8030 (diff)
调整监测页面样式
-rw-r--r--nezha-admin/src/main/resources/statics/css/addDetectType.css8
-rw-r--r--nezha-admin/src/main/resources/statics/css/nodeRoom.css1
-rw-r--r--nezha-admin/src/main/resources/templates/js/modules/detect/deteWarn.js2
-rw-r--r--nezha-admin/src/main/resources/templates/modules/detect/deteSet.html4
-rw-r--r--nezha-admin/src/main/resources/templates/modules/detect/warnTemplate.html2
5 files changed, 11 insertions, 6 deletions
diff --git a/nezha-admin/src/main/resources/statics/css/addDetectType.css b/nezha-admin/src/main/resources/statics/css/addDetectType.css
index a727e96f..e5967c25 100644
--- a/nezha-admin/src/main/resources/statics/css/addDetectType.css
+++ b/nezha-admin/src/main/resources/statics/css/addDetectType.css
@@ -79,7 +79,13 @@
opacity:.35;
filter:alpha(opacity=70);
}
-
+tbody .tools {
+ margin-bottom: 5px;
+}
+tbody .tools .btn {
+ padding: 4px 8px 3px 8px;
+ font-size: 12px;
+}
.active{
background-color: #F5F5F5;
}
diff --git a/nezha-admin/src/main/resources/statics/css/nodeRoom.css b/nezha-admin/src/main/resources/statics/css/nodeRoom.css
index ce608bb2..15377a12 100644
--- a/nezha-admin/src/main/resources/statics/css/nodeRoom.css
+++ b/nezha-admin/src/main/resources/statics/css/nodeRoom.css
@@ -116,7 +116,6 @@
.cab-button {
display: inline-block;
- margin-right: 4px;
font-size: 13px;
color: #999;
}
diff --git a/nezha-admin/src/main/resources/templates/js/modules/detect/deteWarn.js b/nezha-admin/src/main/resources/templates/js/modules/detect/deteWarn.js
index 7dcb5b80..ea1f1cb5 100644
--- a/nezha-admin/src/main/resources/templates/js/modules/detect/deteWarn.js
+++ b/nezha-admin/src/main/resources/templates/js/modules/detect/deteWarn.js
@@ -678,7 +678,7 @@ var warnComponet = Vue.extend({
var temp=this;
var title=temp.setDetail.type.name+" > "+temp.setDetail.name+" > <@spring.message 'deteWarn'/>";
var index = layer.open({
- area: ['600px', '100%'],
+ area: ['550px', '100%'],
shade: 0.01,
title: title,
type: 1,
diff --git a/nezha-admin/src/main/resources/templates/modules/detect/deteSet.html b/nezha-admin/src/main/resources/templates/modules/detect/deteSet.html
index 6494ed5c..b200c08c 100644
--- a/nezha-admin/src/main/resources/templates/modules/detect/deteSet.html
+++ b/nezha-admin/src/main/resources/templates/modules/detect/deteSet.html
@@ -4,8 +4,8 @@
<head>
<title><@spring.message 'deteSet'/></title>
<link rel="stylesheet" href="${request.contextPath}/statics/css/nzNodeSelector.css">
- <link rel="stylesheet" href="${request.contextPath}/statics/css/addDetectType.css">
- <link rel="stylesheet" href="${request.contextPath}/statics/css/detect.css?">
+ <link rel="stylesheet" href="${request.contextPath}/statics/css/addDetectType.css?">
+ <link rel="stylesheet" href="${request.contextPath}/statics/css/detect.css">
<style type="text/css">
table:focus{ outline:none; }
</style>
diff --git a/nezha-admin/src/main/resources/templates/modules/detect/warnTemplate.html b/nezha-admin/src/main/resources/templates/modules/detect/warnTemplate.html
index 29926a5d..c00e9d9e 100644
--- a/nezha-admin/src/main/resources/templates/modules/detect/warnTemplate.html
+++ b/nezha-admin/src/main/resources/templates/modules/detect/warnTemplate.html
@@ -15,7 +15,7 @@
<div >
<span v-show="state==1||state==2" :id="headSpan+setId"><i :class="{'fa fa-angle-double-right':state==1,'fa fa-angle-double-down':state==2}"></i>&nbsp;{{setWarns.length}}个告警</span>
<div :id="bodyTab+setId" v-show="state==2">
- <div class="tools" style="text-align: left">
+ <div class="tools">
<a class="btn btn-default" @click="add" title="<@spring.message 'common.add'/>"><i class="fa fa-plus"></i></a>
<a :disabled="single" class="btn btn-default" @click="update" title="<@spring.message 'common.edit'/>"><i class="fa fa-pencil-square-o"></i></a>
<a :disabled="multi" class="btn btn-default" @click="del" title="<@spring.message 'common.delete'/>"><i class="fa fa-trash-o"></i></a>