diff --git a/src/sass/_vendor-patches.scss b/src/sass/_vendor-patches.scss index a24b063..14a780d 100644 --- a/src/sass/_vendor-patches.scss +++ b/src/sass/_vendor-patches.scss @@ -25,19 +25,3 @@ * Use this file to apply temporary patches to upstream libraries. * To be reviewed at each release. */ - - -/*webtrees 2.1.19 switched to datatables.net-bs5 2.0, which comes with breaking changes - * Temporarily revert/neutralise them, to give time to analyse the best way to address the version change - */ - -table.dataTable { - &.table { - margin-bottom: 6px; - border-spacing: 2px; - } - - th.dt-type-numeric, td.dt-type-numeric { - text-align: unset; - } -} \ No newline at end of file diff --git a/src/sass/rural/_main.scss b/src/sass/rural/_main.scss index bedac66..166d501 100644 --- a/src/sass/rural/_main.scss +++ b/src/sass/rural/_main.scss @@ -181,7 +181,7 @@ form.wt-page-content { border-top-style: none; padding: 1em; - .dt-container { + .dataTables_wrapper { border-style: none; } diff --git a/src/sass/rural/_pages-blocks.scss b/src/sass/rural/_pages-blocks.scss index aee5043..fede8ff 100644 --- a/src/sass/rural/_pages-blocks.scss +++ b/src/sass/rural/_pages-blocks.scss @@ -82,7 +82,7 @@ .wt-block-content { background-color: $maj-c-theme-lighter; - .dt-container { + .dataTables_wrapper { border-style: none; } diff --git a/src/sass/rural/_pages-datatables.scss b/src/sass/rural/_pages-datatables.scss index 42d064c..b023477 100644 --- a/src/sass/rural/_pages-datatables.scss +++ b/src/sass/rural/_pages-datatables.scss @@ -26,7 +26,7 @@ table.center { margin-right: auto; } -.dt-container { +.dataTables_wrapper { @extend .table-responsive; @extend .maj-content-tabs; @extend .mx-auto; @@ -35,10 +35,10 @@ table.center { max-width: 75%; } - .dt-info, - .dt-length, - .dt-search, - .dt-paging { + .dataTables_info, + .dataTables_length, + .dataTables_filter, + .dataTables_paginate { padding: 0.4em; } } @@ -52,7 +52,7 @@ div[role=tabpanel], div[id^=table-indi], div[id^=table-fam], .maj-table-full-width { - .dt-container { + .dataTables_wrapper { max-width: 100%; } }