Merge branch 'main' into email-modal-aria-tweaks

ORCID · Jul 24, 2024 · 5462bba · 5462bba
2 parents cde383b + 7a2e2f8
commit 5462bba
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## v2.102.8 - 2024-07-24
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.7...v2.102.8)
+
+## v2.102.7 - 2024-07-24
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.6...v2.102.7)
+
+## v2.102.6 - 2024-07-24
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.5...v2.102.6)
+
 ## v2.102.5 - 2024-07-23
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.4...v2.102.5)

diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
@@ -248,7 +248,10 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
           >your ORCID account settings.</a
         >
       </p>
-      <div appearance="outline" class="mat-form-field-min">
+      <mat-form-field
+        appearance="outline"
+        class="mat-form-field-min select-notifications-email"
+      >
         <mat-select
           outline="black"
           [aria-label]="ariaLabelSelect"
@@ -259,7 +262,7 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
           }"
           placeholder=" {{ primaryEmail?.value }}"
           [(value)]="primaryEmail"
-          class="select-notifications-email orc-font-body-small"
+          class="orc-font-body-small"
         >
           <ng-container *ngFor="let email of emails">
             <mat-option
@@ -274,7 +277,7 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
             </mat-option>
           </ng-container>
         </mat-select>
-      </div>
+      </mat-form-field>
     </section>
   </div>
 </app-modal>
diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss
@@ -104,14 +104,8 @@ mat-form-field {
 }
 
 .select-notifications-email {
-  padding: 0 8px 0 8px;
-  align-items: center;
-  display: flex;
   height: 38px;
   max-width: 402px;
-  width: auto;
-  border: solid 1px;
-  border-radius: 0 5px 5px 0;
 }
 .current-notification-email {
   font-weight: bold;

diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss-theme.scss b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss-theme.scss
@@ -29,10 +29,11 @@
     background: mat.get-color-from-palette($background, 'ui-background-light');
   }
 
+  ::ng-deep .mat-option-text {
+    color: black;
+  }
+
   .select-notifications-email {
-    ::ng-deep .mat-select-placeholder {
-      color: black;
-    }
     color: rgba(0, 0, 0, 0.12);
   }