Skip to content

Commit e14b65f

Browse files
committed
Adapt tables to Jenkins design language (light and dark theme).
Correctly implement striped tables on light and dark themes. Removed hovering of selected table. Fix pagination controls styling.
1 parent 23c9468 commit e14b65f

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
JENKINS_HOME=../docker/volumes/jenkins-home
66

7-
mvn clean install || { echo "Build failed"; exit 1; }
7+
mvn -o clean install || { echo "Build failed"; exit 1; }
88

99
echo "Installing plugin in $JENKINS_HOME"
1010

src/main/webapp/css/jenkins-style.css

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,10 @@ tfoot {
66
font-weight: bold;
77
}
88

9-
/* Change color of active pagination, to fit to the material blue grey css */
10-
.pagination > .active > a, .pagination > .active > a:focus, .pagination > .active > a:hover, .pagination > .active > span, .pagination > .active > span:focus, .pagination > .active > span:hover {
11-
background-color: #b4b4b4;
12-
border-color: #b4b4b4;
13-
}
14-
15-
/* Change color of inactive pagination, to fit to the material blue grey css */
16-
.pagination > li > a, .pagination > li > span {
17-
color: #b4b4b4;
18-
}
19-
20-
/* Change color of active pagination, to fit to the material blue grey css */
21-
.page-item.active .page-link {
22-
background-color: #b4b4b4;
23-
border-color: #b4b4b4;
9+
div.dataTables_wrapper div.dataTables_paginate ul.pagination {
10+
margin: 2px 4px 4px 0;
11+
white-space: nowrap;
12+
justify-content: flex-end;
2413
}
2514

2615
/* Add color for search (filter) highlighting */
@@ -83,10 +72,23 @@ div.details-control {
8372
/* ------------------------------------------------------------------------------------------------------------------- */
8473
/* DataTables select */
8574
/* ------------------------------------------------------------------------------------------------------------------- */
86-
table.dataTable tbody > tr.selected, table.dataTable tbody > tr > .selected {
87-
background-color: #b4b4b4 !important;
75+
76+
table.dataTable.table-striped > tbody > tr.odd > * {
77+
box-shadow: inset 0 0 0 9999px var(--table-background);
78+
color: var(--text-color)
79+
}
80+
81+
table.dataTable.table-striped > tbody > tr.even > * {
82+
box-shadow: inset 0 0 0 9999px var(--background);
83+
color: var(--text-color)
84+
}
85+
86+
table.dataTable.table-striped > tbody > tr.odd.selected > * {
87+
box-shadow: inset 0 0 0 9999px var(--medium-grey);
88+
color: var(--text-color)
8889
}
8990

90-
table.dataTable tbody tr.selected, table.dataTable tbody th.selected, table.dataTable tbody td.selected {
91-
color: black !important;
91+
table.dataTable.table-striped > tbody > tr.even.selected > * {
92+
box-shadow: inset 0 0 0 9999px var(--medium-grey);
93+
color: var(--text-color)
9294
}

src/main/webapp/js/table.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jQuery3(document).ready(function () {
3636
return '-';
3737
}
3838
const dateTime = luxon.DateTime.fromMillis(data * 1000);
39-
return '<span data-bs-toggle="tooltip" data-bs-placement="bottom" title="'
39+
return '<span data-bs-toggle="tooltip" data-bs-placement="top" title="'
4040
+ dateTime.toLocaleString(luxon.DateTime.DATETIME_SHORT) + '">'
4141
+ dateTime.toRelative({locale: 'en'}) + '</span>';
4242
}

0 commit comments

Comments
 (0)