Merge branch 'main' into feature/register2

ORCID · Nov 23, 2023 · beabf1d · beabf1d
2 parents a1c876d + fe329a5
commit beabf1d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## v2.48.0 - 2023-11-23
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.47.0...v2.48.0)
+
+### Feature
+
+- Add missing branding to sign in page (#2093)
+- Add footer to headless pages (#2092)
+
 ## v2.47.0 - 2023-10-31
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.46.0...v2.47.0)

diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -3,12 +3,8 @@
   <router-outlet name="banner"></router-outlet>
   <app-banners *ngIf="!headlessMode"></app-banners>
   <app-header *ngIf="!headlessMode" currentRoute=""></app-header>
-  <div
-    [ngClass]="{
-      'router-container': !headlessMode
-    }"
-  >
+  <div class="router-container">
     <router-outlet> </router-outlet>
-    <app-footer *ngIf="!headlessMode"></app-footer>
+    <app-footer></app-footer>
   </div>
 </div>
diff --git a/src/app/sign-in/pages/sign-in/sign-in.component.html b/src/app/sign-in/pages/sign-in/sign-in.component.html
@@ -15,13 +15,13 @@
             mode="indeterminate"
           ></mat-progress-bar>
           <mat-card-header>
-            <mat-card-title
-              role="heading"
-              aria-level="1"
-              i18n="@@ngOrcid.signin.title"
-              *ngIf="!isOauthError"
-            >
-              Sign in
+            <mat-card-title role="heading" aria-level="1" *ngIf="!isOauthError">
+              <div class="icon">
+                <img src="assets/vectors/orcid.logo.icon.svg" alt="" />
+              </div>
+              <ng-container i18n="@@ngOrcid.signin.signInToOrcid"
+                >Sign in to ORCID</ng-container
+              >
             </mat-card-title>
           </mat-card-header>
           <mat-card-content>

diff --git a/src/app/sign-in/pages/sign-in/sign-in.component.scss b/src/app/sign-in/pages/sign-in/sign-in.component.scss
@@ -9,9 +9,9 @@
 }
 
 .mat-card-title {
+  margin-top: 32px !important;
   text-align: center;
-  margin-top: 0;
-  margin-bottom: 40px;
+  margin-bottom: 8px !important;
 }
 
 .mat-subheading-2 {
@@ -35,3 +35,11 @@
 .mat-card .mat-divider-horizontal {
   position: relative;
 }
+
+.icon {
+  margin-bottom: 26px;
+
+  img {
+    width: 64px;
+  }
+}
diff --git a/src/locale/properties/signin/signin.en.properties b/src/locale/properties/signin/signin.en.properties
@@ -65,3 +65,4 @@ ngOrcid.signin.unclaimedExists2=resend the claim email?
 ngOrcid.signin.invalidUserType1=Invalid ORCID iD, please
 ngOrcid.signin.invalidUserType2=contact support
 ngOrcid.signin.contactSupport=contact support
+ngOrcid.signin.signInToOrcid=Sign in to ORCID
diff --git a/src/locale/properties/signin/signin.lr.properties b/src/locale/properties/signin/signin.lr.properties
@@ -66,3 +66,4 @@ ngOrcid.signin.verify.reactivationSent=LR
 ngOrcid.signin.passwordTooLong=LR
 ngOrcid.signin.needToReset=LR
 ngOrcid.signin.toSignIn=LR
+ngOrcid.signin.signInToOrcid=LR
diff --git a/src/locale/properties/signin/signin.rl.properties b/src/locale/properties/signin/signin.rl.properties
@@ -66,3 +66,4 @@ ngOrcid.signin.verify.reactivationSent=RL
 ngOrcid.signin.passwordTooLong=RL
 ngOrcid.signin.needToReset=RL
 ngOrcid.signin.toSignIn=RL
+ngOrcid.signin.signInToOrcid=RL
diff --git a/src/locale/properties/signin/signin.xx.properties b/src/locale/properties/signin/signin.xx.properties
@@ -67,3 +67,4 @@ ngOrcid.signin.verify.reactivationSent=X
 ngOrcid.signin.passwordTooLong=X
 ngOrcid.signin.needToReset=X
 ngOrcid.signin.toSignIn=X
+ngOrcid.signin.signInToOrcid=X