Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
leijun
2018-09-28 14:37:03 +08:00
5 changed files with 60 additions and 7 deletions

View File

@@ -5846,7 +5846,7 @@ Custom color buttons
/* Form uneditable input */
.uneditable-input {
padding: 6px 12px;
min-width: 206px;
width: 206px;
font-size: 14px;
font-weight: normal;
height: 34px;
@@ -5856,6 +5856,14 @@ Custom color buttons
-webkit-box-shadow: none;
box-shadow: none;
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
-icab-text-overflow: ellipsis;
-khtml-text-overflow: ellipsis;
-moz-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; }
.form-control-static {

View File

@@ -5174,7 +5174,8 @@ button.close {
.modal-body {
position: relative;
padding: 15px; }
/* padding: 15px; */
}
.modal-footer {
padding: 15px;

View File

@@ -9,16 +9,16 @@ $(function(){
protocol:[],
direction:[]
});
$("input[name$='isCaseSenstive']").on("change",function(){
setIsHexBin(this);
});
setHexCaseSenstive();
$("select[name$='isHexbin']").each(function(){
setIsHexBin(this);
});
$("input[name$='isHex']").on("change",function(){
setIsHexBin(this);
});
$("input[name$='isCaseSenstive']").on("change",function(){
setIsHexBin(this);
});
setHexCaseSenstive();
$("a[name=viewLogInfo]>i").on("click",function(){
var html = "<div class='logInfo'>";
$(this).parents("tr").find("td").each(function(index,element){