Skip to content

update datatables.net-bs #3663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darkexplosiveqwx wants to merge 8 commits into
base: development
Choose a base branch
from
Open

update datatables.net-bs #3663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b52dca4
Update datatables to 1.11.5
darkexplosiveqwx Nov 22, 2025
fcf6432
CSS fix for changes introduced in 1.10.24
darkexplosiveqwx Nov 22, 2025
435bc20
Update datatables to 1.13.11
darkexplosiveqwx Nov 22, 2025
2b09d8f
remove custom CSS for sorting indicators
darkexplosiveqwx Nov 22, 2025
1f1e05e
Apply code review and fixes for alternating color
darkexplosiveqwx Nov 23, 2025
4369db3
use --dt-row-selected
darkexplosiveqwx Jan 29, 2026
d91d8e9
black checkmark on light theme
darkexplosiveqwx Jan 29, 2026
0273c29
make CI happy
darkexplosiveqwx Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"chartjs-adapter-moment": "1.0.1",
"chartjs-plugin-deferred": "2.0.0",
"chartjs-plugin-zoom": "2.2.0",
"datatables.net-bs": "1.10.21",
"datatables.net-bs": "1.13.11",
"datatables.net-buttons-bs": "1.7.1",
"datatables.net-select-bs": "1.3.1",
"daterangepicker": "3.1.0",
Expand Down
8 changes: 1 addition & 7 deletions style/pi-hole.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:root {
/* Datatables Select - bgcolor */
--datatable-bgcolor: #e0e8ee;
--dt-row-selected: 224, 232, 238;

/* Used in settings save button */
--overlay-bgcolor: rgba(212, 220, 232, 0.55);
Expand Down Expand Up @@ -1043,13 +1044,6 @@ table.dataTable tr.selected th.select-checkbox::after {
font-size: 17px;
}

/* Datatables Select - selected row bgcolor */
table.dataTable tbody > tr.selected,
table.dataTable tbody > tr > .selected {
background: none;
background-image: linear-gradient(var(--datatable-bgcolor), var(--datatable-bgcolor));
}

#messagesTable pre {
word-break: break-word;
white-space: pre-wrap;
Expand Down
4 changes: 4 additions & 0 deletions style/themes/default-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
:root {
--datatable-bgcolor: rgba(64, 76, 88, 0.8);
--overlay-bgcolor: var(--datatable-bgcolor);
--dt-row-selected: 64, 76, 88;

/* Dashboard graphic bars */
--allowed-color: #12b660;
Expand Down Expand Up @@ -557,6 +558,9 @@ fieldset[disabled] .form-control {
.table-striped > tbody > tr:nth-of-type(2n + 1) {
background-color: #2d343a;
}
table.dataTable.table-striped > tbody > tr.odd {
background-color: #2d343a;
}
.panel,
.panel-body,
.panel-default > .panel-heading {
Expand Down
4 changes: 4 additions & 0 deletions style/themes/default-darker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ select:-webkit-autofill {
--darkreader-selection-text: #e8e6e3;
--datatable-bgcolor: rgb(35, 47, 52);
--overlay-bgcolor: rgba(35, 47, 52, 0.7);
--dt-row-selected: 35, 47, 52;

/* Dashboard graphic bars */
--allowed-color: #12b660;
Expand Down Expand Up @@ -404,6 +405,9 @@ caption {
.table-striped > tbody > tr:nth-of-type(2n + 1) {
background-color: rgb(27, 30, 31);
}
table.dataTable.table-striped > tbody > tr.odd {
background-color: rgb(27, 30, 31);
}
.table-hover > tbody > tr:hover {
background-color: rgb(30, 32, 33);
}
Expand Down
4 changes: 4 additions & 0 deletions style/themes/default-light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */

:root {
--dt-row-selected-text: 0, 0, 0;
}

.main-header .navbar {
background-color: #3c8dbc;
}
Expand Down
34 changes: 16 additions & 18 deletions style/themes/high-contrast-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

--datatable-bgcolor: rgba(18, 44, 68, 0.3);
--overlay-bgcolor: rgba(24, 28, 32, 0.8);
--dt-row-selected: 18, 44, 68;
}

/* removing transition for every element, to avoid unnecessary movement */
Expand Down Expand Up @@ -742,6 +743,9 @@ fieldset[disabled] .form-control {
.table-striped > tbody > tr:nth-of-type(2n + 1) {
background-color: #1d252d;
}
table.dataTable.table-striped > tbody > tr.odd {
background-color: #1d252d;
}

.panel,
.panel-body,
Expand Down Expand Up @@ -918,29 +922,23 @@ input[type="password"]::-webkit-caps-lock-indicator {
background-color: rgba(0, 64, 64, 0.35);
}

table.dataTable thead .sorting::after,
table.dataTable thead .sorting_asc::after,
table.dataTable thead .sorting_desc::after,
table.dataTable thead .sorting_asc_disabled::after,
table.dataTable thead .sorting_desc_disabled::after {
opacity: 1;
width: 20px;
padding: 0 1px;
border-radius: 4px;
text-align: center;
table.dataTable thead > tr > th.sorting::before {
opacity: 0.4;
}

table.dataTable thead .sorting::after {
opacity: 0.6;
table.dataTable thead > tr > th.sorting::after {
opacity: 0.4;
}

table.dataTable thead th:hover.sorting::after,
table.dataTable thead th:hover.sorting_asc::after,
table.dataTable thead th:hover.sorting_desc::after,
table.dataTable thead th:hover.sorting_asc_disabled::after,
table.dataTable thead th:hover.sorting_desc_disabled::after {
table.dataTable thead > tr > th.sorting:hover::before,
table.dataTable thead > tr > th.sorting:hover::after {
color: var(--primary-color);
}

table.dataTable thead > tr > th.sorting.sorting_asc::before,
table.dataTable thead > tr > th.sorting.sorting_desc::after {
opacity: 1;
color: #fff;
background: #000;
}

td.highlight {
Expand Down
36 changes: 15 additions & 21 deletions style/themes/high-contrast.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
--other-color: #908878;

--overlay-bgcolor: rgba(255, 255, 255, 0.8);
--dt-row-selected-text: 0, 0, 0;
}

/* removing transition for every element, to avoid unnecessary movement */
Expand Down Expand Up @@ -382,9 +383,6 @@ select:-webkit-autofill {
.table-bordered > tfoot > tr > td {
border: 1px solid #d0d0d0;
}
.table-striped > tbody > tr:nth-of-type(2n + 1) {
background-color: #fcfcfc;
}

.blocked-row td {
background-color: rgba(230, 160, 160, 0.3);
Expand All @@ -397,27 +395,23 @@ td.highlight {
background-color: rgba(255, 204, 0, 0.333);
}

table.dataTable thead .sorting:after,
table.dataTable thead .sorting_asc:after,
table.dataTable thead .sorting_desc:after,
table.dataTable thead .sorting_asc_disabled:after,
table.dataTable thead .sorting_desc_disabled:after {
opacity: 1;
width: 20px;
padding: 0 1px;
border-radius: 4px;
text-align: center;
table.dataTable thead > tr > th.sorting::before {
opacity: 0.5;
}

table.dataTable thead > tr > th.sorting::after {
opacity: 0.5;
}
table.dataTable thead .sorting:after {
opacity: 0.6;

table.dataTable thead > tr > th.sorting:hover::before,
table.dataTable thead > tr > th.sorting:hover::after {
color: var(--primary-color);
}
table.dataTable thead th:hover.sorting::after,
table.dataTable thead th:hover.sorting_asc::after,
table.dataTable thead th:hover.sorting_desc::after,
table.dataTable thead th:hover.sorting_asc_disabled::after,
table.dataTable thead th:hover.sorting_desc_disabled::after {

table.dataTable thead > tr > th.sorting.sorting_asc::before,
table.dataTable thead > tr > th.sorting.sorting_desc::after {
opacity: 1;
color: #fff;
background: #000;
}

#domain-frequency .table-responsive table tr th:nth-child(3),
Expand Down
48 changes: 13 additions & 35 deletions style/themes/lcars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
--net-old-color: #125;
--net-older-color: #1c2228;
--datatable-bgcolor: var(--net-old-color);
--dt-row-selected: 17, 34, 85;

/* Dashboard graphic bars */
--allowed-color: #073;
Expand Down Expand Up @@ -1361,44 +1362,27 @@ table.table-bordered.dataTable td {
border: 1px solid #111 !important;
}

table.dataTable thead .sorting::before {
content: "\25B3";
position: absolute;
bottom: 16px;
right: 8px;
display: block;
font-family: "Glyphicons Halflings";
opacity: 0.3;
font-size: 0.6em;
}

table.dataTable thead .sorting:after,
table.dataTable thead .sorting_asc:after,
table.dataTable thead .sorting_desc:after,
table.dataTable thead .sorting_asc_disabled:after,
table.dataTable thead .sorting_desc_disabled:after {
opacity: 0.6;
table.dataTable thead > tr > th.sorting::before {
bottom: calc(50% + 2px);
opacity: 0.2;
}

table.dataTable thead .sorting:after {
opacity: 0.3;
content: "\25BD";
font-size: 0.6em;
table.dataTable thead > tr > th.sorting::after {
opacity: 0.2;
}

table.dataTable thead .sorting_asc::after {
content: "\25B2";
table.dataTable thead > tr > th.sorting.sorting_asc::before {
opacity: 1;
}

table.dataTable thead .sorting_desc::after {
content: "\25BC";
table.dataTable thead > tr > th.sorting.sorting_desc::after {
opacity: 1;
}

table.dataTable thead .sorting_asc_disabled:after,
table.dataTable thead .sorting_desc_disabled:after {
color: #eee;
table.dataTable.table-striped > tbody > tr.odd {
background: none;
background-color: rgba(80, 80, 80, 0.1);
}

.table-striped > tbody > tr:nth-of-type(2n + 1) {
background: none;
background-color: rgba(80, 80, 80, 0.1);
Expand Down Expand Up @@ -1916,12 +1900,6 @@ table.dataTable {
border: none;
}

/*** datatables Select: row, checkbox and button ***/
table.dataTable tbody > tr.selected td,
table.dataTable tbody > tr > .selected td {
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.5);
}

.select-checkbox {
min-width: 8px;
}
Expand Down
6 changes: 3 additions & 3 deletions vendor/datatables/datatables.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading