refactor: 重构 Table Border 样式增加圆角

This commit is contained in:
Argo Zhang 2020-01-31 13:23:54 +08:00
parent 8d119f9897
commit 0e49f723da
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
5 changed files with 55 additions and 32 deletions

View File

@ -23,7 +23,7 @@
}
<div class="card">
<div class="card-header">在线用户<span class="pull-right"><a id="refreshUsers" href="javascript:;" class="fa fa-refresh" title="点击刷新" data-toggle="tooltip" data-placement="left"></a></span></div>
<div class="card-body" style="padding-top: 25px;">
<div class="card-body no-toolbar">
<table></table>
</div>
</div>

View File

@ -132,12 +132,6 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
clear: both;
}
.bootstrap-table .fixed-table-toolbar .bs-bars,
.bootstrap-table .fixed-table-toolbar .search,
.bootstrap-table .fixed-table-toolbar .columns {
margin-top: 10px;
}
.bootstrap-table .fixed-table-toolbar .columns-right {
margin-left: 5px;
}

View File

@ -536,14 +536,11 @@ pre {
flex: 1 1 auto;
}
.bootstrap-table .fixed-table-toolbar {
.bootstrap-table .fixed-table-toolbar .bs-bars, .bootstrap-table .fixed-table-toolbar .search, .bootstrap-table .fixed-table-toolbar .columns {
margin-bottom: 10px;
margin-top: 0;
}
.bootstrap-table .fixed-table-toolbar .bs-bars, .bootstrap-table .fixed-table-toolbar .search, .bootstrap-table .fixed-table-toolbar .columns {
margin-bottom: 0;
}
.tooltip-inner .search-input-tooltip {
font-size: 0.75rem;
}
@ -553,3 +550,46 @@ pre {
background: #17a2b8;
padding: 1px 6px;
}
.modal-body, .card-body {
padding: 15px 15px 0 15px;
}
.no-toolbar .bootstrap-table {
margin-top: -10px;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body {
border-radius: 4px;
border: 1px solid #dee2e6;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table {
border: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table thead th,
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody td {
border-top: none;
border-left: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table thead th:last-child,
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody tr td:last-child {
border-right: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody tr:last-child td{
border-bottom: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body .fixed-table-loading {
left: 0;
right: 0;
}
.bootstrap-table .fixed-table-container.fixed-height .fixed-table-header {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}

View File

@ -539,10 +539,6 @@ input.pending {
white-space: nowrap;
}
.modal-body, .card-body {
padding: 15px 15px 0 15px;
}
.modal-body-fixed {
max-height: calc(54vh);
overflow-y: auto;
@ -600,10 +596,6 @@ input.pending {
margin-left: 6px;
}
.card-body .bootstrap-table {
margin-top: -10px;
}
.card .modal-footer {
padding: 0.5rem 0rem;
}
@ -739,22 +731,18 @@ input.pending {
background-color: rgba(0,0,0,.05);
}
.bootstrap-table .fixed-table-container .fixed-table-body {
border-radius: 4px;
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label {
margin-bottom: 0;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label {
margin-bottom: 0;
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label input[type='checkbox'] {
cursor: pointer;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label input[type='checkbox'] {
cursor: pointer;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table td .btn:not(.btn-lg) {
font-size: 0.75rem;
padding: 1px 5px;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table td .btn:not(.btn-lg) {
font-size: 0.75rem;
padding: 1px 5px;
}
.bootstrap-table .fixed-table-container .table tbody tr.selected td {
background-color: rgba(0, 0, 0, 0.03);

View File

@ -4,6 +4,7 @@ $(function () {
url: apiUrl,
method: "get",
sidePagination: "client",
search: false,
showToggle: false,
showRefresh: false,
showColumns: false,