Merge branch 'hotfix/21.1.1'

Author: cslzchen

src/main/resources/messages.properties

@@ -597,7 +597,7 @@ screen.unsupp-instn.existing.message=If you have already have an OSF password, y
 screen.unsupp-instn.existing.button=Sign in with OSF
 screen.unsupp-instn.existing.setpw.message=If you have not yet set an OSF password for your account, create a password
 screen.unsupp-instn.existing.setpw.button=Set a password
-screen.unsupp-instn.existing.setpw.label.email=<span class="accesskey">E</span>mail
+screen.unsupp-instn.existing.setpw.label.email=Your OSF Account <span class="accesskey">E</span>mail
 screen.unsupp-instn.existing.setpw.label.email.accesskey=e
 #
 # Generic login and logout success page

src/main/resources/static/css/cas.css

@@ -814,10 +814,6 @@ body {
     padding-bottom: 1rem;
 }
 
-.osf-shield-with-name-branded {
-    width: 1px;
-}
-
 .osf-shield-with-name .service-ui-logo {
     padding-right: 0.5rem;
 }
@@ -834,7 +830,7 @@ body {
 .osf-shield-with-name .service-ui-name-branded {
     font-size: 2rem;
     font-weight: normal;
-    white-space: nowrap;
+    overflow-wrap: anywhere;
 }
 
 .text-with-mdi,
@@ -891,6 +887,7 @@ body {
     color: black;
     white-space: nowrap;
     padding-left: 28px;
+    letter-spacing: normal;
 }
 
 .form-button .delegation-button-logo {
@@ -945,11 +942,16 @@ body {
     padding: 0;
 }
 
+.login-instn-card .form-button {
+    margin: 1rem 0;
+}
+
 .login-section .instn-select select {
     width: 100%;
     height: 56px;
     font-size: 1.125rem;
     margin: 0.5rem 0;
+    padding-left: 1rem;
 }
 
 .login-error-list .banner {
@@ -1188,10 +1190,6 @@ body {
     .form-button-inline .delegation-button-label {
         font-size: 1rem;
     }
-
-    .osf-shield-with-name .service-ui-name-branded {
-        white-space: normal;
-    }
 }
 
 @media all and (max-width: 399.99px) {

src/main/resources/templates/casAccountDisabledView.html

@@ -34,7 +34,6 @@ <h2 th:utext="#{screen.accountdisabled.heading}"></h2>
                 </section>
                 <hr class="my-4" />
                 <section class="text-with-mdi" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
-                    <i class="mdi mdi-login mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>
             </section>

src/main/resources/templates/casAccountNotConfirmedIdPView.html

@@ -34,7 +34,6 @@ <h2 th:utext="#{screen.accountnotconfirmedidp.heading}"></h2>
                 </section>
                 <hr class="my-4" />
                 <section class="text-with-mdi">
-                    <i class="mdi mdi-logout mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${osfUrl.logout})}" th:utext="#{screen.authnerror.button.backtoosf}"></a></span>
                 </section>
             </section>

src/main/resources/templates/casAccountNotConfirmedOsfView.html

@@ -34,7 +34,6 @@ <h2 th:utext="#{screen.accountnotconfirmedosf.heading}"></h2>
                 </section>
                 <hr class="my-4" />
                 <section class="text-with-mdi">
-                    <i class="mdi mdi-logout mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${osfUrl.logout})}" th:utext="#{screen.authnerror.button.backtoosf}"></a></span>
                 </section>
             </section>

src/main/resources/templates/casGenericSuccessView.html

@@ -34,7 +34,6 @@ <h2 th:utext="#{screen.generic.loginsuccess.heading}"></h2>
                 </section>
                 <hr class="my-4" />
                 <section class="text-with-mdi">
-                    <i class="mdi mdi-logout mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${osfUrl.logout})}" th:utext="#{screen.generic.loginsuccess.link.cancel}"></a></span>
                 </section>
                 <section>

src/main/resources/templates/casInstitutionLoginView.html

@@ -37,7 +37,6 @@ <h2 th:utext="#{screen.institutionlogin.heading}"></h2>
                     </section>
 
                     <section class="text-with-mdi text-bold text-large">
-                        <i class="mdi mdi-bank mdi-before-text"></i>
                         <span th:unless=${osfCasLoginContext.institutionId} th:utext="#{screen.institutionlogin.heading.select}"></span>
                         <span th:if=${osfCasLoginContext.institutionId} th:utext="#{screen.institutionlogin.heading.auto}"></span>
                     </section>
@@ -49,7 +48,6 @@ <h2 th:utext="#{screen.institutionlogin.heading}"></h2>
                     </section>
 
                     <section class="text-with-mdi">
-                        <i class="mdi mdi-checkbox-blank-off-outline mdi-before-text"></i>
                         <span th:if="${osfCasLoginContext.institutionId}">
                             <a th:href="@{/login(campaign=institution, institutionId=${institutionId ?: ''}, service=${service?.originalUrl ?: ''})}" th:utext="#{screen.institutionlogin.link.select}"></a>
                         </span>
@@ -69,14 +67,12 @@ <h2 th:utext="#{screen.institutionlogin.heading}"></h2>
                     <hr class="my-4" />
 
                     <section class="text-with-mdi">
-                        <i class="mdi mdi-account-question-outline mdi-before-text"></i>
                         <span>
                             <a href="https://help.osf.io/hc/en-us/articles/360019737194-Sign-in-to-OSF" th:utext="#{screen.generic.link.support}"></a>
                         </span>
                     </section>
 
                     <section class="text-with-mdi">
-                        <i class="mdi mdi-backburger mdi-before-text"></i>
                         <span>
                             <a th:href="@{/login(service=${service?.originalUrl ?: ''})}" th:utext="#{screen.institutionlogin.osf}"></a>
                         </span>

src/main/resources/templates/casInstitutionSsoFailedView.html

@@ -34,7 +34,6 @@ <h2 th:utext="#{screen.institutionssofailed.heading}"></h2>
                 </section>
                 <hr class="my-4" />
                 <section class="text-with-mdi">
-                    <i class="mdi mdi-logout mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${osfUrl.logout})}" th:utext="#{screen.authnerror.button.backtoosf}"></a></span>
                 </section>
             </section>

src/main/resources/templates/casInvalidUserStatusView.html

@@ -34,7 +34,6 @@ <h2 th:utext="#{screen.invaliduserstatus.heading}"></h2>
                 </section>
                 <hr class="my-4" />
                 <section class="text-with-mdi" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
-                    <i class="mdi mdi-login mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>
             </section>

src/main/resources/templates/casInvalidVerificationKeyView.html

@@ -34,7 +34,6 @@ <h2 th:utext="#{screen.invalidverificationkey.heading}"></h2>
                 </section>
                 <hr class="my-4" />
                 <section class="text-with-mdi" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
-                    <i class="mdi mdi-login mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>
             </section>