From 7292839ea5cfd2b052c9ebefe693acbe991045bd Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sat, 29 Sep 2018 14:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=80=89=E6=8B=A9=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E8=B0=83=E6=95=B4=EF=BC=8C=E8=A1=A8=E5=A4=B4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/static/global/plugins/bootstrap/css/bootstrap.css  | 1 -
 src/main/webapp/static/global/scripts/common.js               | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
index 2c36da4fa..3d5b41284 100644
--- a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
+++ b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
@@ -1543,7 +1543,6 @@ pre {
     clear: both; }
 
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
-   position: relative;
   min-height: 1px;
 /*   padding-left: 15px;
   padding-right: 15px;  */
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 9c2a95215..245088acf 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1283,7 +1283,7 @@ var viewAreaInfo=function(path,areaEffectiveIds,compileId){
 				var title="";
 				if(data.areaIsps.length > 0){
 					title=$.validator.messages.area;//+" "+$.validator.messages.isp;
-					html+="<table class='table table-striped table-bordered table-condensed' style='margin-left: 10px; width: 96%;'>";
+					html+="<table class='table table-striped table-bordered table-condensed' style='margin-left: 10px; width: 96%;margin-top: 15px;'>";
       			  	html+="<thead>";
       			  		html+="<th style='width:50%;padding-right:0px'>"+$.validator.messages.area+"</th>";/* +
       			  			  "<th style='width:50%;padding-right:0px'>"+$.validator.messages.isp+"</th>";*/
@@ -1302,7 +1302,7 @@ var viewAreaInfo=function(path,areaEffectiveIds,compileId){
 				}
 				if(data.areaIps.length > 0){
 					title=$.validator.messages.area+" ip";
-					html+="<table class='table table-striped table-bordered table-condensed' style='margin-left: 10px; width: 96%;'>";
+					html+="<table class='table table-striped table-bordered table-condensed' style='margin-left: 10px; width: 96%;margin-top: 15px;'>";
 					html+="<thead>";
 					html+="<th style='width:20%;padding-right:0px'>"+$.validator.messages.ip_type+"</th>" +
 						  "<th style='width:20%;padding-right:0px'>"+$.validator.messages.ip_pattern+"</th>" +