AUT-695 Allow line break in alerts

e-gov · Nov 20, 2022 · 53bed12 · 53bed12
1 parent da413e4
commit 53bed12
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/disain/styles/components/_tab-login.scss b/disain/styles/components/_tab-login.scss
@@ -149,6 +149,10 @@
           display: block;
         }
   }
+  &__warning-item {
+    font-weight: bold;
+    white-space: pre-line;
+  }
   &__content-wrap {
     display: flex;
     background-color: #fff;

diff --git a/src/main/resources/static/styles/main.css b/src/main/resources/static/styles/main.css
diff --git a/src/main/resources/templates/fragments/loginform.html b/src/main/resources/templates/fragments/loginform.html
@@ -12,8 +12,9 @@
                 <div th:if="${@thymeleafSupport.hasStaticAlert()}" class="alert alert-warning">
                     <ul>
                         <li th:each="alert : ${activeAlerts}">
-                            <strong th:if="${alert.isLoadedFromConf()}"
-                                    th:utext="${alert.getAlertMessage(#locale.language)}"></strong>
+                            <span th:if="${alert.isLoadedFromConf()}"
+                                  th:utext="${alert.getAlertMessage(#locale.language)}"
+                                  class="c-tab-login__warning-item"></span>
                         </li>
                     </ul>
                 </div>

diff --git a/src/main/resources/templates/fragments/logintabs.html b/src/main/resources/templates/fragments/logintabs.html
@@ -57,14 +57,16 @@ <h2 th:utext="${#messages.msg('label.' + tab_id + '.' + (title ?: 'title'))}"></
         <div class="alert alert-warning">
             <ul>
                 <li th:each="alert : ${alerts}">
-                    <strong th:if="${alert.isLoadedFromConf()}"
-                            th:utext="${alert.getAlertMessage(#locale.language)}"></strong>
-                    <strong th:unless="${alert.isLoadedFromConf()}"
-                            th:text="${alert.getAlertMessage(#locale.language)}"></strong>
+                    <span th:if="${alert.isLoadedFromConf()}"
+                          th:utext="${alert.getAlertMessage(#locale.language)}"
+                          class="c-tab-login__warning-item"></span>
+                    <span th:unless="${alert.isLoadedFromConf()}"
+                          th:text="${alert.getAlertMessage(#locale.language)}"
+                          class="c-tab-login__warning-item"></span>
                 </li>
                 <li th:if="${tab_id == 'id-card'}" id="webeid-warning" class="hidden aria-hidden">
-                    <strong th:utext="#{message.idc.webeid.not.available}" id="webeid-not-available" class="hidden aria-hidden">Web-eID not available.</strong>
-                    <strong th:utext="#{message.idc.webeid.error}" id="webeid-error" class="hidden aria-hidden">Web-eID error, code {0}.</strong>
+                    <span th:utext="#{message.idc.webeid.not.available}" id="webeid-not-available" class="hidden aria-hidden c-tab-login__warning-item">Web-eID not available.</span>
+                    <span th:utext="#{message.idc.webeid.error}" id="webeid-error" class="hidden aria-hidden c-tab-login__warning-item">Web-eID error, code {0}.</span>
                 </li>
             </ul>
         </div>