Automated merge

Mon, 04 Jan 2021 12:45:46 +0100

author
Mike Becker <universe@uap-core.de>
date
Mon, 04 Jan 2021 12:45:46 +0100
changeset 173
1dc56ab7845e
parent 172
89b3320557e2 (diff)
parent 168
1c3694ae224c (current diff)
child 174
690a9aad3f16

Automated merge

     1.1 --- a/src/main/webapp/WEB-INF/jsp/versions.jsp	Sat Dec 26 20:19:09 2020 +0100
     1.2 +++ b/src/main/webapp/WEB-INF/jsp/versions.jsp	Mon Jan 04 12:45:46 2021 +0100
     1.3 @@ -84,7 +84,7 @@
     1.4                      <c:out value="${versionInfo.version.name}"/>
     1.5                  </a>
     1.6                  <div class="version-tag version-${versionInfo.version.status}">
     1.7 -                    <c:out value="${versionInfo.version.status}"/>
     1.8 +                    <fmt:message key="version.status.${versionInfo.version.status}"/>
     1.9                  </div>
    1.10              </td>
    1.11              <td class="hright">${versionInfo.resolvedTotal.open}</td>
     2.1 --- a/src/main/webapp/WEB-INF/jspf/issue-list.jspf	Sat Dec 26 20:19:09 2020 +0100
     2.2 +++ b/src/main/webapp/WEB-INF/jspf/issue-list.jspf	Mon Jan 04 12:45:46 2021 +0100
     2.3 @@ -30,7 +30,7 @@
     2.4                  </div>
     2.5              </td>
     2.6              <td>
     2.7 -                <span class="<c:if test="${issue.overdue}">eta-overdue</c:if> ">
     2.8 +                <span class="nowrap <c:if test="${issue.overdue}">eta-overdue</c:if> ">
     2.9                      <fmt:formatDate value="${issue.eta}" />
    2.10                  </span>
    2.11              </td>
     3.1 --- a/src/main/webapp/error.css	Sat Dec 26 20:19:09 2020 +0100
     3.2 +++ b/src/main/webapp/error.css	Mon Jan 04 12:45:46 2021 +0100
     3.3 @@ -35,11 +35,11 @@
     3.4      width: 100%;
     3.5  
     3.6      border-top-style: solid;
     3.7 -    border-top-width: 1pt;
     3.8 +    border-top-width: thin;
     3.9      border-top-color: #606060;
    3.10  
    3.11      border-bottom-style: solid;
    3.12 -    border-bottom-width: 1pt;
    3.13 +    border-bottom-width: thin;
    3.14      border-bottom-color: #505050;
    3.15  
    3.16      border-collapse: separate;
     4.1 --- a/src/main/webapp/lightpit.css	Sat Dec 26 20:19:09 2020 +0100
     4.2 +++ b/src/main/webapp/lightpit.css	Mon Jan 04 12:45:46 2021 +0100
     4.3 @@ -56,7 +56,7 @@
     4.4      border-image-source: linear-gradient(to right, #606060, rgba(60, 60, 60, .25));
     4.5      border-image-slice: 1;
     4.6      border-bottom-style: solid;
     4.7 -    border-bottom-width: 1pt;
     4.8 +    border-bottom-width: thin;
     4.9  }
    4.10  
    4.11  #sideMenu {
    4.12 @@ -71,7 +71,7 @@
    4.13      border-image-source: linear-gradient(to bottom, #606060, rgba(60, 60, 60, .25));
    4.14      border-image-slice: 1;
    4.15      border-right-style: solid;
    4.16 -    border-right-width: 1pt;
    4.17 +    border-right-width: thin;
    4.18  }
    4.19  
    4.20  #content-area.sidebar-spacing {
    4.21 @@ -91,7 +91,7 @@
    4.22  #mainMenu .menuEntry {
    4.23      padding: .25em 1em .25em 1em;
    4.24      border-right-style: solid;
    4.25 -    border-right-width: 1pt;
    4.26 +    border-right-width: thin;
    4.27      border-right-color: #9095a1;
    4.28  }
    4.29  
    4.30 @@ -99,7 +99,7 @@
    4.31      padding-top: .25em;
    4.32      padding-bottom: .25em;
    4.33      border-bottom-style: solid;
    4.34 -    border-bottom-width: 1pt;
    4.35 +    border-bottom-width: thin;
    4.36      border-bottom-color: #d7d7df;
    4.37  }
    4.38  
    4.39 @@ -131,7 +131,7 @@
    4.40      display: inline-block;
    4.41      font-size: medium;
    4.42      border-style: solid;
    4.43 -    border-width: 1pt;
    4.44 +    border-width: thin;
    4.45      border-color: #606060;
    4.46      color: inherit;
    4.47      background: #f0f0f0;
    4.48 @@ -160,7 +160,7 @@
    4.49  
    4.50  table.datatable {
    4.51      border-style: solid;
    4.52 -    border-width: 1pt;
    4.53 +    border-width: thin;
    4.54      border-color: silver;
    4.55      border-collapse: collapse;
    4.56  }
    4.57 @@ -173,7 +173,7 @@
    4.58  
    4.59  table.datatable th, table.datatable td {
    4.60      border-style: solid;
    4.61 -    border-width: 1pt;
    4.62 +    border-width: thin;
    4.63      border-color: lightgray;
    4.64      padding: .4em;
    4.65  }
    4.66 @@ -239,7 +239,7 @@
    4.67  .info-box, .error-box, .warn-box {
    4.68      margin: 2em;
    4.69      border-style: dashed;
    4.70 -    border-width: 1pt;
    4.71 +    border-width: thin;
    4.72      border-color: deepskyblue;
    4.73      padding: 1em;
    4.74  }
    4.75 @@ -285,5 +285,5 @@
    4.76      padding: 0.25em;
    4.77      border-style: solid;
    4.78      border-color: darkgray;
    4.79 -    border-width: 1pt;
    4.80 +    border-width: thin;
    4.81  }
     5.1 --- a/src/main/webapp/projects.css	Sat Dec 26 20:19:09 2020 +0100
     5.2 +++ b/src/main/webapp/projects.css	Mon Jan 04 12:45:46 2021 +0100
     5.3 @@ -46,7 +46,7 @@
     5.4      display: flex;
     5.5      position: relative;
     5.6      border-style: solid;
     5.7 -    border-width: 1pt;
     5.8 +    border-width: thin;
     5.9      border-color: #6060cc;
    5.10  }
    5.11  
    5.12 @@ -70,7 +70,7 @@
    5.13      display: inline-block;
    5.14      box-sizing: border-box;
    5.15      border-style: solid;
    5.16 -    border-width: 1pt;
    5.17 +    border-width: thin;
    5.18      border-color: silver;
    5.19      border-radius: 4pt;
    5.20      background: lightgray;
    5.21 @@ -141,7 +141,7 @@
    5.22  hr.comments-separator {
    5.23      border-image-source: linear-gradient(to right, rgba(60, 60, 60, .1), rgba(96, 96, 96, 1), rgba(60, 60, 60, .1));
    5.24      border-image-slice: 1;
    5.25 -    border-width: 1pt;
    5.26 +    border-width: thin;
    5.27      border-style: none;
    5.28      border-top-style: solid;
    5.29  }

mercurial