修改BUG:移动公共样式到theme.css

This commit is contained in:
Argo-MacBookPro 2018-08-04 18:47:43 +08:00
parent bfd3453528
commit b33608c293
11 changed files with 102 additions and 146 deletions

View File

@ -53,7 +53,7 @@
</form> </form>
</div> </div>
</div> </div>
<div id="toolbar" class="btn-group hidden"> <div id="toolbar" class="btn-group d-none">
<button id="btn_view" type="button" class="btn btn-danger"> <button id="btn_view" type="button" class="btn btn-danger">
<i class="fa fa-file-text-o" aria-hidden="true"></i><span class="hidden-tb">服务器日志</span> <i class="fa fa-file-text-o" aria-hidden="true"></i><span class="hidden-tb">服务器日志</span>
</button> </button>
@ -68,13 +68,13 @@
<div class="card-header"> <div class="card-header">
查询结果 查询结果
</div> </div>
<div class="panel-body barTable"> <div class="card-body">
<table></table> <table></table>
</div> </div>
</div> </div>
@section modal { @section modal {
<div class="modal fade" id="dialogNew" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="dialogNew" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true">
<div id="errorList" class="modal-dialog"> <div id="errorList" class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="myModalLabel">程序异常日志窗口</h5> <h5 class="modal-title" id="myModalLabel">程序异常日志窗口</h5>
@ -97,13 +97,15 @@
<button type="button" class="close" aria-hidden="true">&times;</button> <button type="button" class="close" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<i id="fa-top" class="fa-target"></i> <div class="iconview">
<div class="affix" id="myScrollspy"> <i id="fa-top" class="fa-target"></i>
<div><a href="#fa-top" class="fa fa-arrow-circle-up"></a></div> <div class="affix">
<div><a href="#fa-bottom" class="fa fa-arrow-circle-down"></a></div> <div><a href="#fa-top" class="fa fa-arrow-circle-up"></a></div>
<div><a href="#fa-bottom" class="fa fa-arrow-circle-down"></a></div>
</div>
<div id="dataFormDetail" class="ex-content"><div class="text-center"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i></div></div>
<i id="fa-bottom" class="fa-target"></i>
</div> </div>
<div id="dataFormDetail" class="ex-content"><div class="text-center"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i></div></div>
<i id="fa-bottom" class="fa-target"></i>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary"> <button type="button" class="btn btn-secondary">

View File

@ -72,7 +72,7 @@
<div class="card-header"> <div class="card-header">
查询结果 查询结果
</div> </div>
<div class="panel-body barTable"> <div class="card-body">
<table></table> <table></table>
</div> </div>
</div> </div>

View File

@ -6,7 +6,9 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form id="groupForm" class="form-inline"></form> <form class="form-inline">
<div class="row" id="groupForm"></div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>

View File

@ -6,7 +6,8 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form id="roleForm" class="form-inline"> <form class="form-inline">
<div class="row" id="roleForm"></div>
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

View File

@ -6,7 +6,9 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form id="userForm" class="form-inline"></form> <form class="form-inline">
<div class="row" id="userForm"></div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>

View File

@ -61,7 +61,7 @@
<div id="panelResultHeader" class="card-header"> <div id="panelResultHeader" class="card-header">
查询结果 查询结果
</div> </div>
<div class="card-body barTable"> <div class="card-body">
<table></table> <table></table>
</div> </div>
</div> </div>

View File

@ -37,69 +37,6 @@
color: #ac2925; color: #ac2925;
} }
.form-inline .form-group {
margin-bottom: 15px;
}
.form-inline .form-group .control-label {
margin-right: 10px;
width: 80px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
justify-content: flex-start;
}
.modal-dialog .modal-body, .card-body {
padding: 15px 15px 0 15px;
}
.modal-dialog .modal-body .form-inline .form-group input[type="text"], .modal-dialog .modal-body .form-inline .form-group input[type="password"] {
padding-right: 30px;
}
.btn span:last-child {
margin-left: 4px;
}
.modal-header {
background-color: #f5f5f5;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
padding: 10px 15px;
}
.modal-body .checkbox, .modal-body .radio {
min-width: 190px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.modal-footer .btn {
padding-left: 22px;
padding-right: 22px;
}
input.is-invalid {
background-repeat: no-repeat;
background-image: url('../images/error.png');
background-position: right 8px center;
}
input.is-valid {
background-repeat: no-repeat;
background-image: url('../images/success.png');
background-position: right 8px center;
}
input.pending {
background-repeat: no-repeat;
background-image: url(../img/loading-sm.gif);
background-position: right 8px center;
}
.main-content { .main-content {
transition: all .4s ease-in-out; transition: all .4s ease-in-out;
padding: 15px 15px 0 15px; padding: 15px 15px 0 15px;
@ -218,30 +155,13 @@ aside {
padding: 12px 0; padding: 12px 0;
} }
/*Modal Dialog Checkbox*/ .affix {
.modal-body .checkbox, .modal-dialog .radio {
padding: 0;
margin-top: 0;
}
.modal-body .checkbox label, .modal-body .radio label {
padding-left: 0;
}
.modal-body .checkbox label input[type='checkbox'], .modal-body .radio label input[type='radio'] {
margin: 0 4px 0 0;
vertical-align: middle;
position: relative;
top: -1px;
}
.modal-body .affix {
position: fixed; position: fixed;
bottom: 95px; bottom: 95px;
right: 50px; right: 50px;
} }
.modal-body .affix a { .affix a {
font-size: 2rem; font-size: 2rem;
margin-top: 16px; margin-top: 16px;
} }
@ -281,24 +201,6 @@ aside {
color: #235e90; color: #235e90;
} }
/*cache*/
.panel .fa-refresh {
font-size: 1.5rem;
}
.bootstrap-select .dropdown-menu {
padding: 0;
}
.bootstrap-select .dropdown-menu > li > a {
padding-top: 7px;
padding-bottom: 7px;
}
input[type="datetime"] {
min-width: 220px;
}
/*Messages*/ /*Messages*/
.mail-box { .mail-box {
display: flex; display: flex;
@ -432,25 +334,3 @@ input[type="datetime"] {
.mail-box .lg-side .table-inbox tr td:hover { .mail-box .lg-side .table-inbox tr td:hover {
cursor: pointer; cursor: pointer;
} }
/*Bootstrap Table BUG */
.fixed-table-loading {
padding-top: 5px;
}
.bootstrap-table {
padding-bottom: 15px;
}
.bootstrap-table .fixed-table-body .table {
border-bottom: none;
}
/*Bootstrap Table BUG END*/
.input-group.form_date span {
border-left: none;
}
.barTable {
padding: 5px 15px 0px 15px;
}

View File

@ -217,14 +217,8 @@
margin-right: 10px; margin-right: 10px;
} }
.logitem {
overflow: hidden;
text-overflow: ellipsis;
}
.logfile { .logfile {
color: #d41404; color: #d41404;
white-space: nowrap;
} }
.logfile:focus, .logfile:active, .logfile:hover { .logfile:focus, .logfile:active, .logfile:hover {
@ -233,6 +227,12 @@
.logfile span { .logfile span {
margin-left: 4px; margin-left: 4px;
max-width: 146px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
display: inline-block;
vertical-align: middle;
} }
.modal-header > h4 { .modal-header > h4 {

View File

@ -11,6 +11,75 @@
border-bottom-color: #dc3545; border-bottom-color: #dc3545;
} }
input.is-invalid {
background-repeat: no-repeat;
background-image: url('../images/error.png');
background-position: right 8px center;
}
input.is-valid {
background-repeat: no-repeat;
background-image: url('../images/success.png');
background-position: right 8px center;
}
input.pending {
background-repeat: no-repeat;
background-image: url(../img/loading-sm.gif);
background-position: right 8px center;
}
.form-check-input { .form-check-input {
margin-top: 6.4px; margin-top: 6.4px;
} }
.form-inline .form-group {
margin-bottom: 15px;
}
.form-inline .form-group .control-label {
margin-right: 10px;
width: 80px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
justify-content: flex-start;
}
.modal-header {
background-color: #f5f5f5;
padding: 10px 15px;
}
.modal-body, .card-body {
padding: 15px 15px 0 15px;
}
.btn span:last-child {
margin-left: 4px;
}
input[data-valid="true"] {
padding-right: 30px;
}
.form-check-input + span, .form-check-input + label {
max-width: 148px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
/*Bootstrap Table BUG */
.fixed-table-loading {
padding: 8px;
}
.bootstrap-table .fixed-table-body .table {
border-bottom: none;
}
.card-body .bootstrap-table {
margin-top: -10px;
}
/*Bootstrap Table BUG END*/

View File

@ -44,16 +44,16 @@
url: Exceptions.url, swal: false, url: Exceptions.url, swal: false,
callback: function (result) { callback: function (result) {
var html = result.map(function (ele) { var html = result.map(function (ele) {
return $.format('<div class="form-group col-lg-3 col-md-3 col-sm-4 col-xs-6 logitem"><a class="logfile" title="{0}" href="#"><i class="fa fa-file-text-o"></i><span>{0}</span></a></div>', ele); return $.format('<div class="form-group col-lg-3 col-md-3 col-sm-4 col-6"><a class="logfile" data-toggle="tooltip" title="{0}" href="#"><i class="fa fa-file-text-o"></i><span>{0}</span></a></div>', ele);
}).join(''); }).join('');
$dataForm.children('div').html(html); $dataForm.children('div').html(html).find('[data-toggle="tooltip"]').tooltip();
$dialog.modal('show'); $dialog.modal('show');
} }
}); });
}); });
$dialog.on('click', 'a', function () { $dialog.on('click', 'a', function () {
var fileName = $(this).find('span').text(); var fileName = $(this).tooltip('hide').find('span').text();
$errorDetailTitle.text(fileName); $errorDetailTitle.text(fileName);
$errorList.hide(); $errorList.hide();
$errorDetail.show(); $errorDetail.show();

View File

@ -120,7 +120,7 @@
contentType: 'application/json', contentType: 'application/json',
dataType: 'json', dataType: 'json',
method: "post", method: "post",
htmlTemplate: '<div class="form-group col-md-3 col-sm-4 col-6"><div class="form-check"><label class="form-check-label" title="{3}" data-toggle="tooltip"><input type="checkbox" class="form-check-input" value="{0}" {2}/>{1}</label></div></div>', htmlTemplate: '<div class="form-group col-md-3 col-sm-4 col-6"><div class="form-check"><label class="form-check-label" title="{3}" data-toggle="tooltip"><input type="checkbox" class="form-check-input" value="{0}" {2}/><span>{1}</span></label></div></div>',
title: "", title: "",
swal: true, swal: true,
modal: null, modal: null,