rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-02-21 19:54:15 +01:00
Code Issues Releases Activity

Dev: Fix display class for the sort column.

Browse Source 
- Styles weren't being correctly applied becuase the selector was
  `table.dataTable.display.stripe` rather than just
  `table.dataTable.display` for the "correction" styles when multiple
  styles are enabled.
This commit is contained in:
Allan Jardine 2013-06-20 10:08:40 +01:00
parent bda2d25b5f
commit a194116c42
2 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
media/css/jquery.dataTables.css
View File

@ -87,35 +87,35 @@ table.dataTable {
table.dataTable.display tbody tr > .sorting_2, table.dataTable.display tbody tr > .sorting_2,
table.dataTable.display tbody tr > .sorting_3 { table.dataTable.display tbody tr > .sorting_3 {
background-color: #f9f9f9; } background-color: #f9f9f9; }
table.dataTable.sort-column.stripe tbody tr.odd > .sorting_1, table.dataTable.display.stripe tbody tr.odd > .sorting_1 { table.dataTable.display tbody tr.odd > .sorting_1, table.dataTable.sort-column.stripe tbody tr.odd > .sorting_1 {
background-color: #f1f1f1; } background-color: #f1f1f1; }
table.dataTable.sort-column.stripe tbody tr.odd > .sorting_2, table.dataTable.display.stripe tbody tr.odd > .sorting_2 { table.dataTable.display tbody tr.odd > .sorting_2, table.dataTable.sort-column.stripe tbody tr.odd > .sorting_2 {
background-color: #f3f3f3; } background-color: #f3f3f3; }
table.dataTable.sort-column.stripe tbody tr.odd > .sorting_3, table.dataTable.display.stripe tbody tr.odd > .sorting_3 { table.dataTable.display tbody tr.odd > .sorting_3, table.dataTable.sort-column.stripe tbody tr.odd > .sorting_3 {
background-color: whitesmoke; } background-color: whitesmoke; }
table.dataTable.sort-column.stripe tbody tr.even > .sorting_1, table.dataTable.display.stripe tbody tr.even > .sorting_1 { table.dataTable.display tbody tr.even > .sorting_1, table.dataTable.sort-column.stripe tbody tr.even > .sorting_1 {
background-color: #f9f9f9; } background-color: #f9f9f9; }
table.dataTable.sort-column.stripe tbody tr.even > .sorting_2, table.dataTable.display.stripe tbody tr.even > .sorting_2 { table.dataTable.display tbody tr.even > .sorting_2, table.dataTable.sort-column.stripe tbody tr.even > .sorting_2 {
background-color: #fbfbfb; } background-color: #fbfbfb; }
table.dataTable.sort-column.stripe tbody tr.even > .sorting_3, table.dataTable.display.stripe tbody tr.even > .sorting_3 { table.dataTable.display tbody tr.even > .sorting_3, table.dataTable.sort-column.stripe tbody tr.even > .sorting_3 {
background-color: #fdfdfd; } background-color: #fdfdfd; }
table.dataTable.sort-column.hover tbody tr:hover > .sorting_1, table.dataTable.display tbody tr:hover > .sorting_1,
table.dataTable.display tbody tr.odd:hover > .sorting_1,
table.dataTable.display tbody tr.even:hover > .sorting_1, table.dataTable.sort-column.hover tbody tr:hover > .sorting_1,
table.dataTable.sort-column.hover tbody tr.odd:hover > .sorting_1, table.dataTable.sort-column.hover tbody tr.odd:hover > .sorting_1,
table.dataTable.sort-column.hover tbody tr.even:hover > .sorting_1, table.dataTable.display.hover tbody tr:hover > .sorting_1, table.dataTable.sort-column.hover tbody tr.even:hover > .sorting_1 {
table.dataTable.display.hover tbody tr.odd:hover > .sorting_1,
table.dataTable.display.hover tbody tr.even:hover > .sorting_1 {
background-color: #eaeaea; } background-color: #eaeaea; }
table.dataTable.sort-column.hover tbody tr:hover > .sorting_2, table.dataTable.display tbody tr:hover > .sorting_2,
table.dataTable.display tbody tr.odd:hover > .sorting_2,
table.dataTable.display tbody tr.even:hover > .sorting_2, table.dataTable.sort-column.hover tbody tr:hover > .sorting_2,
table.dataTable.sort-column.hover tbody tr.odd:hover > .sorting_2, table.dataTable.sort-column.hover tbody tr.odd:hover > .sorting_2,
table.dataTable.sort-column.hover tbody tr.even:hover > .sorting_2, table.dataTable.display.hover tbody tr:hover > .sorting_2, table.dataTable.sort-column.hover tbody tr.even:hover > .sorting_2 {
table.dataTable.display.hover tbody tr.odd:hover > .sorting_2,
table.dataTable.display.hover tbody tr.even:hover > .sorting_2 {
background-color: #ebebeb; } background-color: #ebebeb; }
table.dataTable.sort-column.hover tbody tr:hover > .sorting_3, table.dataTable.display tbody tr:hover > .sorting_3,
table.dataTable.display tbody tr.odd:hover > .sorting_3,
table.dataTable.display tbody tr.even:hover > .sorting_3, table.dataTable.sort-column.hover tbody tr:hover > .sorting_3,
table.dataTable.sort-column.hover tbody tr.odd:hover > .sorting_3, table.dataTable.sort-column.hover tbody tr.odd:hover > .sorting_3,
table.dataTable.sort-column.hover tbody tr.even:hover > .sorting_3, table.dataTable.display.hover tbody tr:hover > .sorting_3, table.dataTable.sort-column.hover tbody tr.even:hover > .sorting_3 {
table.dataTable.display.hover tbody tr.odd:hover > .sorting_3,
table.dataTable.display.hover tbody tr.even:hover > .sorting_3 {
background-color: #eeeeee; } background-color: #eeeeee; }
/* /*

74
media/css/jquery.dataTables.scss
View File

@ -201,47 +201,49 @@ table.dataTable {
background-color: shade($table-row-background, 2%); // shade by fa background-color: shade($table-row-background, 2%); // shade by fa
} }
} }
}
&.stripe tbody { &.display tbody,
tr.odd > .sorting_1 { &.sort-column.stripe tbody {
background-color: shade($table-row-background, 5.4%); // shade by f1 tr.odd > .sorting_1 {
} background-color: shade($table-row-background, 5.4%); // shade by f1
tr.odd > .sorting_2 { }
background-color: shade($table-row-background, 4.7%); // shade by f3; tr.odd > .sorting_2 {
} background-color: shade($table-row-background, 4.7%); // shade by f3;
tr.odd > .sorting_3 { }
background-color: shade($table-row-background, 3.9%); // shade by f5 tr.odd > .sorting_3 {
} background-color: shade($table-row-background, 3.9%); // shade by f5
tr.even > .sorting_1 {
background-color: shade($table-row-background, 2%); // shade by fa
}
tr.even > .sorting_2 {
background-color: shade($table-row-background, 1.2%); // shade by fc
}
tr.even > .sorting_3 {
background-color: shade($table-row-background, 0.4%); // shade by fe
}
} }
&.hover tbody { tr.even > .sorting_1 {
tr:hover > .sorting_1, background-color: shade($table-row-background, 2%); // shade by fa
tr.odd:hover > .sorting_1, }
tr.even:hover > .sorting_1 { tr.even > .sorting_2 {
background-color: shade($table-row-background, 8.2%); // shade by ea background-color: shade($table-row-background, 1.2%); // shade by fc
} }
tr.even > .sorting_3 {
background-color: shade($table-row-background, 0.4%); // shade by fe
}
}
tr:hover > .sorting_2, &.display tbody,
tr.odd:hover > .sorting_2, &.sort-column.hover tbody {
tr.even:hover > .sorting_2 { tr:hover > .sorting_1,
background-color: shade($table-row-background, 7.5%); // shade by ec tr.odd:hover > .sorting_1,
} tr.even:hover > .sorting_1 {
background-color: shade($table-row-background, 8.2%); // shade by ea
}
tr:hover > .sorting_3, tr:hover > .sorting_2,
tr.odd:hover > .sorting_3, tr.odd:hover > .sorting_2,
tr.even:hover > .sorting_3 { tr.even:hover > .sorting_2 {
background-color: shade($table-row-background, 6.3%); // shade by ef background-color: shade($table-row-background, 7.5%); // shade by ec
} }
tr:hover > .sorting_3,
tr.odd:hover > .sorting_3,
tr.even:hover > .sorting_3 {
background-color: shade($table-row-background, 6.3%); // shade by ef
} }
} }
} }