Merge pull request #2050 from ORCID/leo/aug-22-batch-fixes

Leo/aug 22 batch fixes
ORCID · Aug 23, 2023 · 5bce66b · 5bce66b
2 parents b9fbc59 + a6221eb
commit 5bce66b
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 15 deletions.
diff --git a/src/app/cdk/panel/panel/panel.component.scss b/src/app/cdk/panel/panel/panel.component.scss
@@ -10,6 +10,7 @@
   align-items: center;
   justify-content: space-between;
   min-height: 56px;
+  padding-right: 8px;
   word-break: normal;
   overflow-wrap: anywhere;
   h2 {

diff --git a/src/app/cdk/panel/panels/panels.component.html b/src/app/cdk/panel/panels/panels.component.html
@@ -234,7 +234,9 @@ <h3 class="activity-header orc-font-body-large">
           *ngFor="let option of sortTypes"
           [attr.aria-label]="option | appPanelsSortByAriaLabel : type"
         >
-          {{ option | sortLabel }}
+          <div class="padding-right">
+            {{ option | sortLabel }}
+          </div>
           <mat-icon
             aria-hidden="false"
             class="sort"

diff --git a/src/app/cdk/panel/panels/panels.component.scss b/src/app/cdk/panel/panels/panels.component.scss
@@ -12,28 +12,34 @@
   padding-inline-start: 8px;
   padding-inline-end: 16px;
   border-radius: 4px;
+
   .text-container,
   .inline-initial-side {
     max-width: 100%;
     display: flex;
     flex-direction: row;
     align-items: center;
+
     span {
       margin-left: 3px;
     }
+
     button {
       margin-inline-end: 4px;
     }
+
     .text-container {
       margin-bottom: 5px;
       margin-top: 5px;
+
       h3 {
         span {
           font-weight: normal;
         }
       }
     }
   }
+
   .controls {
     display: flex;
 
@@ -71,3 +77,7 @@
 .activity-header {
   margin: 0;
 }
+
+.padding-right {
+  padding-right: 40px;
+}
diff --git a/src/app/cdk/panel/sort-label.pipe.ts b/src/app/cdk/panel/sort-label.pipe.ts
@@ -11,7 +11,7 @@ export class SortLabelPipe implements PipeTransform {
     end: $localize`:@@share.sortEnd:End`,
     date: $localize`:@@share.sortDate:Date`,
     type: $localize`:@@share.sortType:Type`,
-    order: $localize`:@@share.sortOrder:Order`,
+    order: $localize`:@@share.sortOrderv2:Publication/Grant title`,
   }
   transform(value: SortOrderType): string {
     return this.SortOrderTypeLabel[value]

diff --git a/src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.ts b/src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.ts
@@ -18,7 +18,7 @@ export class AppPanelsSortByAriaLabelPipe implements PipeTransform {
       case 'type':
         return getTypeLabelByType(type)
       case 'order':
-        return $localize`:@@shared.peerReviewsSortOrder:Sort peer reviews by order`
+        return $localize`:@@shared.peerReviewsSortOrderv2:Sort peer review by Publication/Grant title`
     }
   }
 }

diff --git a/src/app/trusted-summary/component/summary-panel/summary-panel.component.scss b/src/app/trusted-summary/component/summary-panel/summary-panel.component.scss
@@ -32,6 +32,7 @@
     flex-direction: row;
     align-items: initial;
     justify-content: space-between;
+    line-height: 24px;
 
     .header-title {
       display: flex;
@@ -67,15 +68,10 @@
   margin-inline-start: 27px;
 }
 
-mat-icon.margin-compensation {
-  margin-bottom: 3px;
-}
 
 mat-icon {
   min-width: 25px;
   margin-inline-end: 3px;
-  margin-top: -3px;
-
   img {
     margin-top: 2px;
     display: block;

diff --git a/src/app/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.scss b/src/app/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.scss
@@ -56,15 +56,9 @@
   margin-inline-start: 25px;
 }
 
-mat-icon.margin-compensation {
-  margin-bottom: 3px;
-}
-
 mat-icon {
   min-width: 25px;
   margin-inline-end: 3px;
-  margin-top: -3px;
-
   img {
     margin-top: 2px;
     display: block;
@@ -81,3 +75,7 @@ a {
   overflow: hidden;
   word-wrap: break-word;
 }
+
+.header {
+  line-height: 24px;
+}
diff --git a/src/locale/properties/shared/shared.en.properties b/src/locale/properties/shared/shared.en.properties
@@ -92,6 +92,8 @@ share.sortEnd=End
 share.sortDate=Date
 share.sortType=Type
 share.sortOrder=Order
+share.sortOrder=Order
+share.sortOrderv2=Publication/Grant title
 shared.activities=Activities
 shared.addToList=Add to list
 shared.organization=Organization
@@ -621,7 +623,7 @@ shared.fundingSortType=Sort funding by type
 shared.worksSortTitle=Sort works by title
 shared.worksSortDate=Sort works by date
 shared.worksSortType=Sort works by type
-shared.peerReviewsSortOrder=Sort peer reviews by order
+shared.peerReviewsSortOrderv2=Sort peer review by Publication/Grant title
 shared.researchSortTitle=Sort research resources by title
 shared.researchSortDate=Sort research resources by date
 shared.today=Today