Mon, 04 Jan 2021 12:45:46 +0100
Automated merge
--- a/src/main/webapp/WEB-INF/jsp/versions.jsp Sat Dec 26 20:19:09 2020 +0100 +++ b/src/main/webapp/WEB-INF/jsp/versions.jsp Mon Jan 04 12:45:46 2021 +0100 @@ -84,7 +84,7 @@ <c:out value="${versionInfo.version.name}"/> </a> <div class="version-tag version-${versionInfo.version.status}"> - <c:out value="${versionInfo.version.status}"/> + <fmt:message key="version.status.${versionInfo.version.status}"/> </div> </td> <td class="hright">${versionInfo.resolvedTotal.open}</td>
--- a/src/main/webapp/WEB-INF/jspf/issue-list.jspf Sat Dec 26 20:19:09 2020 +0100 +++ b/src/main/webapp/WEB-INF/jspf/issue-list.jspf Mon Jan 04 12:45:46 2021 +0100 @@ -30,7 +30,7 @@ </div> </td> <td> - <span class="<c:if test="${issue.overdue}">eta-overdue</c:if> "> + <span class="nowrap <c:if test="${issue.overdue}">eta-overdue</c:if> "> <fmt:formatDate value="${issue.eta}" /> </span> </td>
--- a/src/main/webapp/error.css Sat Dec 26 20:19:09 2020 +0100 +++ b/src/main/webapp/error.css Mon Jan 04 12:45:46 2021 +0100 @@ -35,11 +35,11 @@ width: 100%; border-top-style: solid; - border-top-width: 1pt; + border-top-width: thin; border-top-color: #606060; border-bottom-style: solid; - border-bottom-width: 1pt; + border-bottom-width: thin; border-bottom-color: #505050; border-collapse: separate;
--- a/src/main/webapp/lightpit.css Sat Dec 26 20:19:09 2020 +0100 +++ b/src/main/webapp/lightpit.css Mon Jan 04 12:45:46 2021 +0100 @@ -56,7 +56,7 @@ border-image-source: linear-gradient(to right, #606060, rgba(60, 60, 60, .25)); border-image-slice: 1; border-bottom-style: solid; - border-bottom-width: 1pt; + border-bottom-width: thin; } #sideMenu { @@ -71,7 +71,7 @@ border-image-source: linear-gradient(to bottom, #606060, rgba(60, 60, 60, .25)); border-image-slice: 1; border-right-style: solid; - border-right-width: 1pt; + border-right-width: thin; } #content-area.sidebar-spacing { @@ -91,7 +91,7 @@ #mainMenu .menuEntry { padding: .25em 1em .25em 1em; border-right-style: solid; - border-right-width: 1pt; + border-right-width: thin; border-right-color: #9095a1; } @@ -99,7 +99,7 @@ padding-top: .25em; padding-bottom: .25em; border-bottom-style: solid; - border-bottom-width: 1pt; + border-bottom-width: thin; border-bottom-color: #d7d7df; } @@ -131,7 +131,7 @@ display: inline-block; font-size: medium; border-style: solid; - border-width: 1pt; + border-width: thin; border-color: #606060; color: inherit; background: #f0f0f0; @@ -160,7 +160,7 @@ table.datatable { border-style: solid; - border-width: 1pt; + border-width: thin; border-color: silver; border-collapse: collapse; } @@ -173,7 +173,7 @@ table.datatable th, table.datatable td { border-style: solid; - border-width: 1pt; + border-width: thin; border-color: lightgray; padding: .4em; } @@ -239,7 +239,7 @@ .info-box, .error-box, .warn-box { margin: 2em; border-style: dashed; - border-width: 1pt; + border-width: thin; border-color: deepskyblue; padding: 1em; } @@ -285,5 +285,5 @@ padding: 0.25em; border-style: solid; border-color: darkgray; - border-width: 1pt; + border-width: thin; }
--- a/src/main/webapp/projects.css Sat Dec 26 20:19:09 2020 +0100 +++ b/src/main/webapp/projects.css Mon Jan 04 12:45:46 2021 +0100 @@ -46,7 +46,7 @@ display: flex; position: relative; border-style: solid; - border-width: 1pt; + border-width: thin; border-color: #6060cc; } @@ -70,7 +70,7 @@ display: inline-block; box-sizing: border-box; border-style: solid; - border-width: 1pt; + border-width: thin; border-color: silver; border-radius: 4pt; background: lightgray; @@ -141,7 +141,7 @@ hr.comments-separator { border-image-source: linear-gradient(to right, rgba(60, 60, 60, .1), rgba(96, 96, 96, 1), rgba(60, 60, 60, .1)); border-image-slice: 1; - border-width: 1pt; + border-width: thin; border-style: none; border-top-style: solid; }