fix: merge in dev
This commit is contained in:
parent
98a3b03be7
commit
8760781660
|
@ -789,11 +789,11 @@ es:
|
||||||
thead tr:first-child th {
|
thead tr:first-child th {
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD .q-table__top {
|
.q-table__top {
|
||||||
top: 0;
|
top: 0;
|
||||||
padding: 12px 0;
|
padding: 12px 0;
|
||||||
}
|
}
|
||||||
=======>>>>>>>d13cab0a240a3a10db97a793022ba0f5ded48965 tbody {
|
tbody {
|
||||||
.q-checkbox {
|
.q-checkbox {
|
||||||
display: flex;
|
display: flex;
|
||||||
margin-bottom: 9px;
|
margin-bottom: 9px;
|
||||||
|
|
Loading…
Reference in New Issue