From 9eb716415292e607de6ecfccf489cc2e232837b9 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Thu, 24 Oct 2013 13:20:13 +0100 Subject: [PATCH] Fix: On pages which use *{box-sizing:border-box} scrolling would break - The fix here is to set the box sizing for the table and its cells to be content-box sizing to allow the column width calculations to occur correctly - 17932 --- .datatables-commit-sync | 2 +- media/css/jquery.dataTables.css | 8 ++++++++ media/css/jquery.dataTables_themeroller.css | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 4d93036c..6731464a 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -de247bfb9788a34d7b61d827d5a90a7d5bf43db6 +f36773920884cfe0f05fbf81c132d0133f5d23dd diff --git a/media/css/jquery.dataTables.css b/media/css/jquery.dataTables.css index 15b5d60b..b7d4cd42 100644 --- a/media/css/jquery.dataTables.css +++ b/media/css/jquery.dataTables.css @@ -210,6 +210,14 @@ table.dataTable.sort-column.hover tbody tr.even:hover.selected > .sorting_3 { background-color: #a4b2cb; } +table.dataTable, +table.dataTable th, +table.dataTable td { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + /* * Control feature layout */ diff --git a/media/css/jquery.dataTables_themeroller.css b/media/css/jquery.dataTables_themeroller.css index 4783b247..b5070591 100644 --- a/media/css/jquery.dataTables_themeroller.css +++ b/media/css/jquery.dataTables_themeroller.css @@ -203,6 +203,14 @@ table.dataTable.sort-column.hover tbody tr.even:hover.selected > .sorting_3 { background-color: #a4b2cb; } +table.dataTable, +table.dataTable th, +table.dataTable td { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + /* * Control feature layout */