diff --git a/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.scss b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.scss index 60f241b31d..c9e0ca83fa 100644 --- a/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.scss +++ b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.scss @@ -1,42 +1,42 @@ @font-face { font-family: "Fira_Sans"; - src: url(../../../../assets/fonts/Fira_Sans/FiraSans-Regular.ttf) format("truetype"); + src: url(../../../../assets/fonts/Fira_Sans/FiraSans-Regular.woff2) format("woff2"); font-display: swap; } @font-face { font-family: "Lato"; - src: url(../../../../assets/fonts/Lato/Lato-Regular.ttf) format("truetype"); + src: url(../../../../assets/fonts/Lato/Lato-Regular.woff2) format("woff2"); font-display: swap; } @font-face { font-family: "Libre_Baskerville"; - src: url(../../../../assets/fonts/Libre_Baskerville/LibreBaskerville-Regular.ttf) format("truetype"); + src: url(../../../../assets/fonts/Libre_Baskerville/LibreBaskerville-Regular.woff2) format("woff2"); font-display: swap; } @font-face { font-family: "Merriweather"; - src: url(../../../../assets/fonts/Merriweather/Merriweather-Regular.ttf) format("truetype"); + src: url(../../../../assets/fonts/Merriweather/Merriweather-Regular.woff2) format("woff2"); font-display: swap; } @font-face { font-family: "Nanum_Gothic"; - src: url(../../../../assets/fonts/Nanum_Gothic/NanumGothic-Regular.ttf) format("truetype"); + src: url(../../../../assets/fonts/Nanum_Gothic/NanumGothic-Regular.woff2) format("woff2"); font-display: swap; } @font-face { font-family: "RocknRoll_One"; - src: url(../../../../assets/fonts/RocknRoll_One/RocknRollOne-Regular.ttf) format("truetype"); + src: url(../../../../assets/fonts/RocknRoll_One/RocknRollOne-Regular.woff2) format("woff2"); font-display: swap; } @font-face { font-family: "OpenDyslexic2"; - src: url(../../../../assets/fonts/OpenDyslexic2/OpenDyslexic-Regular.otf) format("opentype"); + src: url(../../../../assets/fonts/OpenDyslexic2/OpenDyslexic-Regular.woff2) format("woff2"); font-display: swap; } diff --git a/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.html b/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.html index 917c83e60c..3504839472 100644 --- a/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.html +++ b/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.html @@ -1,28 +1,31 @@ - + +

Password Reset

 -

Enter the new password

-
-
-   - - Password must be between 6 and 32 characters in length - - - -
-
- This field is required -
-
- Password must be between 6 and 32 characters in length -
-
+

Enter the new password

+ +
+   + + Password must be between 6 and 32 characters in length + + + +
+
+ This field is required
- -
- +
+ Password must be between 6 and 32 characters in length
- +
+
+ +
+ +
+ - + + + diff --git a/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.ts b/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.ts index c38ba5c2bf..15c507da22 100644 --- a/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.ts +++ b/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.ts @@ -7,6 +7,7 @@ import { NavService } from 'src/app/_services/nav.service'; import { NgTemplateOutlet, NgIf } from '@angular/common'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { SplashContainerComponent } from '../splash-container/splash-container.component'; +import {TranslocoModule} from "@ngneat/transloco"; @Component({ selector: 'app-confirm-reset-password', @@ -14,7 +15,7 @@ import { SplashContainerComponent } from '../splash-container/splash-container.c styleUrls: ['./confirm-reset-password.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [SplashContainerComponent, ReactiveFormsModule, NgbTooltip, NgTemplateOutlet, NgIf] + imports: [SplashContainerComponent, ReactiveFormsModule, NgbTooltip, NgTemplateOutlet, NgIf, TranslocoModule] }) export class ConfirmResetPasswordComponent { @@ -24,7 +25,7 @@ export class ConfirmResetPasswordComponent { password: new FormControl('', [Validators.required, Validators.maxLength(32), Validators.minLength(6)]), }); - constructor(private route: ActivatedRoute, private router: Router, + constructor(private route: ActivatedRoute, private router: Router, private accountService: AccountService, private toastr: ToastrService, private readonly cdRef: ChangeDetectorRef, private navService: NavService) { diff --git a/UI/Web/src/assets/fonts/EBGarmond/EBGaramond-Italic-VariableFont_wght.woff2 b/UI/Web/src/assets/fonts/EBGarmond/EBGaramond-Italic-VariableFont_wght.woff2 new file mode 100644 index 0000000000..8a4e2586da Binary files /dev/null and b/UI/Web/src/assets/fonts/EBGarmond/EBGaramond-Italic-VariableFont_wght.woff2 differ diff --git a/UI/Web/src/assets/fonts/EBGarmond/EBGaramond-VariableFont_wght.woff2 b/UI/Web/src/assets/fonts/EBGarmond/EBGaramond-VariableFont_wght.woff2 new file mode 100644 index 0000000000..906683c4d4 Binary files /dev/null and b/UI/Web/src/assets/fonts/EBGarmond/EBGaramond-VariableFont_wght.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Black.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Black.woff2 new file mode 100644 index 0000000000..570a1a8d13 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Black.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-BlackItalic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-BlackItalic.woff2 new file mode 100644 index 0000000000..3bc14b33a2 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-BlackItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Bold.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Bold.woff2 new file mode 100644 index 0000000000..397279502b Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Bold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-BoldItalic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-BoldItalic.woff2 new file mode 100644 index 0000000000..d76ccf6644 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-BoldItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraBold.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraBold.woff2 new file mode 100644 index 0000000000..88040a8bf7 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraBold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraBoldItalic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraBoldItalic.woff2 new file mode 100644 index 0000000000..740b7fe746 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraBoldItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraLight.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraLight.woff2 new file mode 100644 index 0000000000..ad41e9b505 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraLight.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraLightItalic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraLightItalic.woff2 new file mode 100644 index 0000000000..b8e77a266c Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ExtraLightItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Italic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Italic.woff2 new file mode 100644 index 0000000000..ec14dbe614 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Italic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Light.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Light.woff2 new file mode 100644 index 0000000000..9444b6d293 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Light.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-LightItalic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-LightItalic.woff2 new file mode 100644 index 0000000000..0b43055c60 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-LightItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Medium.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Medium.woff2 new file mode 100644 index 0000000000..d18786460d Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Medium.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-MediumItalic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-MediumItalic.woff2 new file mode 100644 index 0000000000..ca1334c9b8 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-MediumItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Regular.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Regular.woff2 new file mode 100644 index 0000000000..ce2185f947 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-SemiBold.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-SemiBold.woff2 new file mode 100644 index 0000000000..99044260f5 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-SemiBold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-SemiBoldItalic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-SemiBoldItalic.woff2 new file mode 100644 index 0000000000..5d01cfd3ba Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-SemiBoldItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Thin.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Thin.woff2 new file mode 100644 index 0000000000..48a1ef7e00 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-Thin.woff2 differ diff --git a/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ThinItalic.woff2 b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ThinItalic.woff2 new file mode 100644 index 0000000000..ff588c5a49 Binary files /dev/null and b/UI/Web/src/assets/fonts/Fira_Sans/FiraSans-ThinItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-Black.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-Black.woff2 new file mode 100644 index 0000000000..e2650cf446 Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-Black.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-BlackItalic.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-BlackItalic.woff2 new file mode 100644 index 0000000000..fc8fd42e94 Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-BlackItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-Bold.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-Bold.woff2 new file mode 100644 index 0000000000..9d34cd0191 Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-Bold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-BoldItalic.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-BoldItalic.woff2 new file mode 100644 index 0000000000..7438e2db49 Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-BoldItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-Italic.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-Italic.woff2 new file mode 100644 index 0000000000..6313451b6e Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-Italic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-Light.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-Light.woff2 new file mode 100644 index 0000000000..a4bc5107b9 Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-Light.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-LightItalic.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-LightItalic.woff2 new file mode 100644 index 0000000000..33e940004d Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-LightItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-Regular.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-Regular.woff2 new file mode 100644 index 0000000000..f98f78f4ff Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-Thin.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-Thin.woff2 new file mode 100644 index 0000000000..034ed58993 Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-Thin.woff2 differ diff --git a/UI/Web/src/assets/fonts/Lato/Lato-ThinItalic.woff2 b/UI/Web/src/assets/fonts/Lato/Lato-ThinItalic.woff2 new file mode 100644 index 0000000000..13936f681e Binary files /dev/null and b/UI/Web/src/assets/fonts/Lato/Lato-ThinItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Bold.woff2 b/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Bold.woff2 new file mode 100644 index 0000000000..c76512e3dc Binary files /dev/null and b/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Bold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Italic.woff2 b/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Italic.woff2 new file mode 100644 index 0000000000..2704a75e6f Binary files /dev/null and b/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Italic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Regular.woff2 b/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Regular.woff2 new file mode 100644 index 0000000000..3940070282 Binary files /dev/null and b/UI/Web/src/assets/fonts/Libre_Baskerville/LibreBaskerville-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Bold.woff2 b/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Bold.woff2 new file mode 100644 index 0000000000..a9a8aa7d36 Binary files /dev/null and b/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Bold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Italic.woff2 b/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Italic.woff2 new file mode 100644 index 0000000000..3d151905cb Binary files /dev/null and b/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Italic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Regular.woff2 b/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Regular.woff2 new file mode 100644 index 0000000000..c704420a97 Binary files /dev/null and b/UI/Web/src/assets/fonts/Libre_Caslon/LibreCaslonText-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/Merriweather/Merriweather-Black.woff2 b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Black.woff2 new file mode 100644 index 0000000000..6514ef18ce Binary files /dev/null and b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Black.woff2 differ diff --git a/UI/Web/src/assets/fonts/Merriweather/Merriweather-BlackItalic.woff2 b/UI/Web/src/assets/fonts/Merriweather/Merriweather-BlackItalic.woff2 new file mode 100644 index 0000000000..9e32177e5e Binary files /dev/null and b/UI/Web/src/assets/fonts/Merriweather/Merriweather-BlackItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Merriweather/Merriweather-Bold.woff2 b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Bold.woff2 new file mode 100644 index 0000000000..3a097cdbd1 Binary files /dev/null and b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Bold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Merriweather/Merriweather-BoldItalic.woff2 b/UI/Web/src/assets/fonts/Merriweather/Merriweather-BoldItalic.woff2 new file mode 100644 index 0000000000..1aa05c4744 Binary files /dev/null and b/UI/Web/src/assets/fonts/Merriweather/Merriweather-BoldItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Merriweather/Merriweather-Italic.woff2 b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Italic.woff2 new file mode 100644 index 0000000000..56d8ac60e9 Binary files /dev/null and b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Italic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Merriweather/Merriweather-Light.woff2 b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Light.woff2 new file mode 100644 index 0000000000..8450633c7e Binary files /dev/null and b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Light.woff2 differ diff --git a/UI/Web/src/assets/fonts/Merriweather/Merriweather-LightItalic.woff2 b/UI/Web/src/assets/fonts/Merriweather/Merriweather-LightItalic.woff2 new file mode 100644 index 0000000000..7c63aa7553 Binary files /dev/null and b/UI/Web/src/assets/fonts/Merriweather/Merriweather-LightItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/Merriweather/Merriweather-Regular.woff2 b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Regular.woff2 new file mode 100644 index 0000000000..7e750b018f Binary files /dev/null and b/UI/Web/src/assets/fonts/Merriweather/Merriweather-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-Bold.woff2 b/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-Bold.woff2 new file mode 100644 index 0000000000..3af95e13c1 Binary files /dev/null and b/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-Bold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-ExtraBold.woff2 b/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-ExtraBold.woff2 new file mode 100644 index 0000000000..dd9ae7c93e Binary files /dev/null and b/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-ExtraBold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-Regular.woff2 b/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-Regular.woff2 new file mode 100644 index 0000000000..987ffb8367 Binary files /dev/null and b/UI/Web/src/assets/fonts/Nanum_Gothic/NanumGothic-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Bold.woff2 b/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Bold.woff2 new file mode 100644 index 0000000000..8544fca3dd Binary files /dev/null and b/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Bold.woff2 differ diff --git a/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-BoldItalic.woff2 b/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-BoldItalic.woff2 new file mode 100644 index 0000000000..eca759cd3e Binary files /dev/null and b/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-BoldItalic.woff2 differ diff --git a/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Italic.woff2 b/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Italic.woff2 new file mode 100644 index 0000000000..8cbf2a1c14 Binary files /dev/null and b/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Italic.woff2 differ diff --git a/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Regular.woff2 b/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Regular.woff2 new file mode 100644 index 0000000000..75c5190a92 Binary files /dev/null and b/UI/Web/src/assets/fonts/OpenDyslexic2/OpenDyslexic-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/Oswald/Oswald-VariableFont_wght.woff2 b/UI/Web/src/assets/fonts/Oswald/Oswald-VariableFont_wght.woff2 new file mode 100644 index 0000000000..bbeb489ed0 Binary files /dev/null and b/UI/Web/src/assets/fonts/Oswald/Oswald-VariableFont_wght.woff2 differ diff --git a/UI/Web/src/assets/fonts/Oswald/static/Oswald-Bold.woff2 b/UI/Web/src/assets/fonts/Oswald/static/Oswald-Bold.woff2 new file mode 100644 index 0000000000..1e4dd50ddd Binary files /dev/null and b/UI/Web/src/assets/fonts/Oswald/static/Oswald-Bold.woff2 differ diff --git a/UI/Web/src/assets/fonts/Oswald/static/Oswald-ExtraLight.woff2 b/UI/Web/src/assets/fonts/Oswald/static/Oswald-ExtraLight.woff2 new file mode 100644 index 0000000000..76dfc19629 Binary files /dev/null and b/UI/Web/src/assets/fonts/Oswald/static/Oswald-ExtraLight.woff2 differ diff --git a/UI/Web/src/assets/fonts/Oswald/static/Oswald-Light.woff2 b/UI/Web/src/assets/fonts/Oswald/static/Oswald-Light.woff2 new file mode 100644 index 0000000000..9736d731f9 Binary files /dev/null and b/UI/Web/src/assets/fonts/Oswald/static/Oswald-Light.woff2 differ diff --git a/UI/Web/src/assets/fonts/Oswald/static/Oswald-Medium.woff2 b/UI/Web/src/assets/fonts/Oswald/static/Oswald-Medium.woff2 new file mode 100644 index 0000000000..480599dbb0 Binary files /dev/null and b/UI/Web/src/assets/fonts/Oswald/static/Oswald-Medium.woff2 differ diff --git a/UI/Web/src/assets/fonts/Oswald/static/Oswald-Regular.woff2 b/UI/Web/src/assets/fonts/Oswald/static/Oswald-Regular.woff2 new file mode 100644 index 0000000000..0bc741e2c1 Binary files /dev/null and b/UI/Web/src/assets/fonts/Oswald/static/Oswald-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/Oswald/static/Oswald-SemiBold.woff2 b/UI/Web/src/assets/fonts/Oswald/static/Oswald-SemiBold.woff2 new file mode 100644 index 0000000000..8a2cbf3ed0 Binary files /dev/null and b/UI/Web/src/assets/fonts/Oswald/static/Oswald-SemiBold.woff2 differ diff --git a/UI/Web/src/assets/fonts/RocknRoll_One/RocknRollOne-Regular.woff2 b/UI/Web/src/assets/fonts/RocknRoll_One/RocknRollOne-Regular.woff2 new file mode 100644 index 0000000000..b82052265a Binary files /dev/null and b/UI/Web/src/assets/fonts/RocknRoll_One/RocknRollOne-Regular.woff2 differ diff --git a/UI/Web/src/assets/fonts/Spartan/Spartan-VariableFont_wght.woff2 b/UI/Web/src/assets/fonts/Spartan/Spartan-VariableFont_wght.woff2 new file mode 100644 index 0000000000..95294c5ea4 Binary files /dev/null and b/UI/Web/src/assets/fonts/Spartan/Spartan-VariableFont_wght.woff2 differ diff --git a/UI/Web/src/assets/fonts/convert-fonts.py b/UI/Web/src/assets/fonts/convert-fonts.py new file mode 100644 index 0000000000..cc5cf9a10d --- /dev/null +++ b/UI/Web/src/assets/fonts/convert-fonts.py @@ -0,0 +1,25 @@ +import os +from fontTools.ttLib import TTFont + +# Function to convert a font file to woff2 +def convert_to_woff2(font_path): + font = TTFont(font_path) + font.flavor = 'woff2' + new_path = os.path.splitext(font_path)[0] + '.woff2' + font.save(new_path) + return new_path + +def main(): + # Get the current directory of the script + current_directory = os.path.dirname(os.path.abspath(__file__)) + + # Search for all OTF files recursively in the current directory + for root, _, files in os.walk(current_directory): + for file in files: + if file.lower().endswith(('.otf', '.ttf')) and not file.lower().endswith(('.woff', '.woff2')): + font_file = os.path.join(root, file) + new_path = convert_to_woff2(font_file) + print(f"Converted {font_file} to {new_path}") + +if __name__ == "__main__": + main() diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json index 4272569d55..08e87eb830 100644 --- a/UI/Web/src/assets/langs/en.json +++ b/UI/Web/src/assets/langs/en.json @@ -642,6 +642,10 @@ "success": "Success!" }, + "confirm-reset-password": { + + }, + "validation": { "required-field": "This field is required", "valid-email": "This must be a valid email" diff --git a/UI/Web/src/styles.scss b/UI/Web/src/styles.scss index c2eaca8fb0..313f42126a 100644 --- a/UI/Web/src/styles.scss +++ b/UI/Web/src/styles.scss @@ -50,13 +50,13 @@ // Global Styles @font-face { font-family: "EBGarmond"; - src: url("assets/fonts/EBGarmond/EBGaramond-VariableFont_wght.ttf") format("truetype"); + src: url("assets/fonts/EBGarmond/EBGaramond-VariableFont_wght.woff2") format("woff2"); font-display: swap; } @font-face { font-family: "Spartan"; - src: url("assets/fonts/Spartan/Spartan-VariableFont_wght.ttf"); + src: url("assets/fonts/Spartan/Spartan-VariableFont_wght.woff2") format("woff2"); font-display: swap; }