Merge pull request #355 from jenkinsci/theme-design

Adapt tables to Jenkins design language (light and dark theme)
jenkinsci · May 19, 2023 · 6bb5f7c · 6bb5f7c
2 parents b507592 + e14b65f
commit 6bb5f7c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/go.sh b/go.sh
@@ -4,7 +4,7 @@ set -e
 
 JENKINS_HOME=../docker/volumes/jenkins-home
 
-mvn clean install || { echo "Build failed"; exit 1; }
+mvn -o clean install || { echo "Build failed"; exit 1; }
 
 echo "Installing plugin in $JENKINS_HOME"
 

diff --git a/src/main/webapp/css/jenkins-style.css b/src/main/webapp/css/jenkins-style.css
@@ -6,21 +6,10 @@ tfoot {
     font-weight: bold;
 }
 
-/* Change color of active pagination, to fit to the material blue grey css */
-.pagination > .active > a, .pagination > .active > a:focus, .pagination > .active > a:hover, .pagination > .active > span, .pagination > .active > span:focus, .pagination > .active > span:hover {
-    background-color: #b4b4b4;
-    border-color: #b4b4b4;
-}
-
-/* Change color of inactive pagination, to fit to the material blue grey css */
-.pagination > li > a, .pagination > li > span {
-    color: #b4b4b4;
-}
-
-/* Change color of active pagination, to fit to the material blue grey css */
-.page-item.active .page-link {
-    background-color: #b4b4b4;
-    border-color: #b4b4b4;
+div.dataTables_wrapper div.dataTables_paginate ul.pagination {
+    margin: 2px 4px 4px 0;
+    white-space: nowrap;
+    justify-content: flex-end;
 }
 
 /* Add color for search (filter) highlighting */
@@ -83,10 +72,23 @@ div.details-control {
 /* ------------------------------------------------------------------------------------------------------------------- */
 /* DataTables select                                                                                                  */
 /* ------------------------------------------------------------------------------------------------------------------- */
-table.dataTable tbody > tr.selected, table.dataTable tbody > tr > .selected {
-    background-color: #b4b4b4 !important;
+
+table.dataTable.table-striped > tbody > tr.odd > * {
+    box-shadow: inset 0 0 0 9999px var(--table-background);
+    color: var(--text-color)
+}
+
+table.dataTable.table-striped > tbody > tr.even > * {
+    box-shadow: inset 0 0 0 9999px var(--background);
+    color: var(--text-color)
+}
+
+table.dataTable.table-striped > tbody > tr.odd.selected > * {
+    box-shadow: inset 0 0 0 9999px var(--medium-grey);
+    color: var(--text-color)
 }
 
-table.dataTable tbody tr.selected, table.dataTable tbody th.selected, table.dataTable tbody td.selected {
-    color: black !important;
+table.dataTable.table-striped > tbody > tr.even.selected > * {
+    box-shadow: inset 0 0 0 9999px var(--medium-grey);
+    color: var(--text-color)
 }
diff --git a/src/main/webapp/js/table.js b/src/main/webapp/js/table.js
@@ -36,7 +36,7 @@ jQuery3(document).ready(function () {
                                     return '-';
                                 }
                                 const dateTime = luxon.DateTime.fromMillis(data * 1000);
-                                return '<span data-bs-toggle="tooltip" data-bs-placement="bottom" title="'
+                                return '<span data-bs-toggle="tooltip" data-bs-placement="top" title="'
                                     + dateTime.toLocaleString(luxon.DateTime.DATETIME_SHORT) + '">'
                                     + dateTime.toRelative({locale: 'en'}) + '</span>';
                             }