Skip to content

Commit

Permalink
Merge pull request #2210 from ORCID/lmendoza/batch-fixes-mar-20-2024
Browse files Browse the repository at this point in the history
batch-fixes-mar-20-2024
  • Loading branch information
leomendoza123 authored Mar 20, 2024
2 parents 49ecfed + ced6aee commit 378ff88
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/app/authorize/pages/authorize/authorize.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<main id="main">
<main id="main" *ngIf="!loading">
<div class="container">
<div class="row space-around">
<div
Expand All @@ -18,7 +18,7 @@
>
<app-form-authorize
[signInUpdatesV1Togglz]="signInUpdatesV1Togglz"
*ngIf="showAuthorizationComponent && !loading"
*ngIf="showAuthorizationComponent"
></app-form-authorize>
<app-oauth-error
*ngIf="!showAuthorizationComponent"
Expand Down
5 changes: 3 additions & 2 deletions src/app/cdk/my-orcid-alerts/my-orcid-alerts.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ng-container *ngIf="!signInUpdatesV1Togglz">
<mat-toolbar>
<mat-toolbar-row>
<div role="alert">
<div role="alert" aria-label="polite">
<p class="mat-body-2">
<ng-container
i18n="@@myOrcidAlerts.invalidVerifyUrl"
Expand All @@ -24,6 +24,7 @@
<ng-container *ngIf="signInUpdatesV1Togglz">
<ng-container *ngIf="emailVerified || invalidVerifyUrl">
<div
aria-label="polite"
[ngClass]="{
verification: emailVerified,
invalid: invalidVerifyUrl
Expand Down Expand Up @@ -58,7 +59,7 @@
</div>
</ng-container>
<ng-container *ngIf="printError && badCredentials">
<div class="invalid">
<div class="invalid" aria-label="polite">
<div>
<mat-icon class="large-material-icon material-symbols-outlined"
>warning</mat-icon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ main.inside-iframe {
border-right: 2px solid;
}

h2 {
h3 {
font-weight: 600;
letter-spacing: 2px;
}
Expand Down Expand Up @@ -201,7 +201,7 @@ a {
gap: 8px;
}

h2.hover-effect {
h3.hover-effect {
text-decoration: underline;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
$background: map-get($theme, background);

a {
h2.hover-effect {
h3.hover-effect {
color: mat.get-color-from-palette($primary, 500);
}

h1 {
color: #fff;
}

h2 {
h3 {
color: black;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</mat-error>
</ng-container>
<ng-container *ngIf="signInUpdatesV1Togglz">
<div class="info">
<div class="info" aria-live="polite">
<div>
<mat-icon class="large-material-icon material-symbols-outlined"
>error</mat-icon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
[signInUpdatesV1Togglz]="signInUpdatesV1Togglz"
[printError]="printError"
[badCredentials]="badCredentials"
[attr.aria-live]="'polite'"
></app-my-orcid-alerts>
<div class="input-container">
<mat-label
Expand Down Expand Up @@ -195,13 +194,11 @@
[showInvalidUser]="showInvalidUser"
[orcidPrimaryDeprecated]="orcidPrimaryDeprecated"
[email]="email"
[attr.aria-live]="'polite'"
>
</app-print-errors>
<app-deactivated
*ngIf="!signInUpdatesV1Togglz && showDeactivatedError"
[email]="email"
[attr.aria-live]="'polite'"
>
</app-deactivated>
<app-two-factor-authentication-form
Expand Down
1 change: 0 additions & 1 deletion src/app/sign-in/pages/sign-in/sign-in.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*ngIf="!signInUpdatesV1Togglz && (emailVerified || invalidVerifyUrl)"
[emailVerified]="emailVerified"
[invalidVerifyUrl]="invalidVerifyUrl"
[attr.aria-live]="'polite'"
></app-my-orcid-alerts>
<div class="container">
<div class="row space-around">
Expand Down

0 comments on commit 378ff88

Please sign in to comment.