重新提交
This commit is contained in:
parent
7a9d0929cb
commit
5a95e18d90
|
@ -71,13 +71,8 @@
|
||||||
overflow: hidden; }
|
overflow: hidden; }
|
||||||
.u-table-header {
|
.u-table-header {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
<<<<<<< HEAD
|
|
||||||
background: rgb(223, 225, 230);
|
|
||||||
color: rgb(102, 102, 102); }
|
|
||||||
=======
|
|
||||||
background: rgb(241, 242, 245);
|
background: rgb(241, 242, 245);
|
||||||
color: rgb(33, 33, 33); }
|
color: rgb(33, 33, 33); }
|
||||||
>>>>>>> d22d3eedc74d2580946a0e615dff0a862b240889
|
|
||||||
.u-table.fixed-height td {
|
.u-table.fixed-height td {
|
||||||
padding: 0px 8px; }
|
padding: 0px 8px; }
|
||||||
.u-table-fixed-header .u-table-body {
|
.u-table-fixed-header .u-table-body {
|
||||||
|
@ -201,13 +196,8 @@
|
||||||
.u-table-thead .filter-wrap .filter-btns {
|
.u-table-thead .filter-wrap .filter-btns {
|
||||||
min-width: 58px; }
|
min-width: 58px; }
|
||||||
.u-table-thead th {
|
.u-table-thead th {
|
||||||
<<<<<<< HEAD
|
|
||||||
background: rgb(223, 225, 230);
|
|
||||||
color: rgb(102, 102, 102);
|
|
||||||
=======
|
|
||||||
background: rgb(241, 242, 245);
|
background: rgb(241, 242, 245);
|
||||||
color: rgb(33, 33, 33);
|
color: rgb(33, 33, 33);
|
||||||
>>>>>>> d22d3eedc74d2580946a0e615dff0a862b240889
|
|
||||||
background-clip: padding-box;
|
background-clip: padding-box;
|
||||||
-moz-user-select: -moz-none;
|
-moz-user-select: -moz-none;
|
||||||
-khtml-user-select: none;
|
-khtml-user-select: none;
|
||||||
|
@ -286,36 +276,39 @@
|
||||||
.u-table-thead-th:last-child-drag-gap {
|
.u-table-thead-th:last-child-drag-gap {
|
||||||
border: none; }
|
border: none; }
|
||||||
.u-table-filter-column-pop-cont {
|
.u-table-filter-column-pop-cont {
|
||||||
margin: 10px;
|
margin: 0px;
|
||||||
margin-top: 0px;
|
max-height: 300px;
|
||||||
height: 300px;
|
|
||||||
overflow-y: scroll; }
|
overflow-y: scroll; }
|
||||||
.u-table-filter-column-clear-setting {
|
.u-table-filter-column-clear-setting {
|
||||||
border-bottom: 1px solid #ccc;
|
margin-bottom: 4px; }
|
||||||
cursor: pointer; }
|
|
||||||
.u-table-filter-column-cont {
|
.u-table-filter-column-cont {
|
||||||
position: relative; }
|
position: relative; }
|
||||||
.u-table-filter-column-filter-icon {
|
.u-table-filter-column-filter-icon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 3px;
|
top: 8px;
|
||||||
right: 18px;
|
right: 18px;
|
||||||
width: 22px;
|
width: 22px;
|
||||||
height: 25px;
|
height: 25px;
|
||||||
line-height: 25px;
|
line-height: 25px;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
background: rgb(241, 242, 245); }
|
background: rgb(241, 242, 245);
|
||||||
.u-table-filter-column-filter-iconi.uf {
|
text-align: center;
|
||||||
|
cursor: pointer; }
|
||||||
|
.u-table-filter-column-filter-icon i.uf {
|
||||||
padding: 0px; }
|
padding: 0px; }
|
||||||
.u-table-filter-column-pop-cont-item {
|
.u-table-filter-column-pop-cont-item {
|
||||||
margin-top: 10px;
|
margin-top: 8px;
|
||||||
line-height: 30px;
|
|
||||||
cursor: pointer; }
|
cursor: pointer; }
|
||||||
|
.u-table-filter-column-pop-cont-item .u-checkbox {
|
||||||
|
margin: 0px; }
|
||||||
.u-table-filter-column-pop-cont-item > span {
|
.u-table-filter-column-pop-cont-item > span {
|
||||||
margin-left: 5px;
|
margin-left: -3px;
|
||||||
width: 100px;
|
width: 132px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap; }
|
white-space: nowrap;
|
||||||
|
display: inline-block;
|
||||||
|
vertical-align: middle; }
|
||||||
.u-table-filter-column-pop .u-modal-dialog {
|
.u-table-filter-column-pop .u-modal-dialog {
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
background: #fff; }
|
background: #fff; }
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -71,8 +71,8 @@
|
||||||
overflow: hidden; }
|
overflow: hidden; }
|
||||||
.u-table-header {
|
.u-table-header {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background: rgb(223, 225, 230);
|
background: rgb(241, 242, 245);
|
||||||
color: rgb(102, 102, 102); }
|
color: rgb(33, 33, 33); }
|
||||||
.u-table.fixed-height td {
|
.u-table.fixed-height td {
|
||||||
padding: 0px 8px; }
|
padding: 0px 8px; }
|
||||||
.u-table-fixed-header .u-table-body {
|
.u-table-fixed-header .u-table-body {
|
||||||
|
@ -202,8 +202,8 @@
|
||||||
.u-table-thead .filter-wrap .filter-btns {
|
.u-table-thead .filter-wrap .filter-btns {
|
||||||
min-width: 58px; }
|
min-width: 58px; }
|
||||||
.u-table-thead th {
|
.u-table-thead th {
|
||||||
background: rgb(223, 225, 230);
|
background: rgb(241, 242, 245);
|
||||||
color: rgb(102, 102, 102);
|
color: rgb(33, 33, 33);
|
||||||
background-clip: padding-box;
|
background-clip: padding-box;
|
||||||
-moz-user-select: -moz-none;
|
-moz-user-select: -moz-none;
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
|
@ -293,7 +293,7 @@
|
||||||
height: 25px;
|
height: 25px;
|
||||||
line-height: 25px;
|
line-height: 25px;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
background: rgb(223, 225, 230);
|
background: rgb(241, 242, 245);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
cursor: pointer; }
|
cursor: pointer; }
|
||||||
.u-table-filter-column-filter-icon i.uf {
|
.u-table-filter-column-filter-icon i.uf {
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue