Skip to content

Commit db9445f

Browse files
authored
Merge pull request #916 from nsemets/fix/ui-fixes
Fixed UI issues after upgrade
2 parents 165f147 + 6a153df commit db9445f

48 files changed

Lines changed: 358 additions & 350 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/app/core/theme/components.ts

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,6 @@ import { primitives } from './primitives';
22

33
export const components = {
44
button: {
5-
root: {
6-
success: {
7-
hoverBackground: primitives.colors.greenThree,
8-
hoverBorderColor: primitives.colors.greenThree,
9-
},
10-
danger: {
11-
hoverBackground: primitives.colors.redThree,
12-
hoverBorderColor: primitives.colors.redThree,
13-
},
14-
secondary: {
15-
background: primitives.colors.bgBlueThree,
16-
hoverBackground: primitives.colors.bgBlueTwo,
17-
activeBackground: primitives.colors.bgBlueThree,
18-
borderColor: primitives.colors.bgBlueThree,
19-
hoverBorderColor: primitives.colors.bgBlueTwo,
20-
color: primitives.colors.darkBlueTwo,
21-
hoverColor: primitives.colors.prBlueThree,
22-
},
23-
},
245
outlined: {
256
primary: {
267
hoverBackground: primitives.colors.bgBlueTwo,
@@ -34,6 +15,14 @@ export const components = {
3415
colorScheme: {
3516
light: {
3617
root: {
18+
success: {
19+
hoverBackground: primitives.colors.greenThree,
20+
hoverBorderColor: primitives.colors.greenThree,
21+
},
22+
danger: {
23+
hoverBackground: primitives.colors.redThree,
24+
hoverBorderColor: primitives.colors.redThree,
25+
},
3726
info: {
3827
background: primitives.colors.transparent,
3928
hoverBackground: primitives.colors.transparent,
@@ -45,6 +34,15 @@ export const components = {
4534
hoverColor: primitives.colors.darkBlueOne,
4635
activeColor: primitives.colors.darkBlueOne,
4736
},
37+
secondary: {
38+
background: primitives.colors.bgBlueThree,
39+
hoverBackground: primitives.colors.bgBlueTwo,
40+
activeBackground: primitives.colors.bgBlueThree,
41+
borderColor: primitives.colors.bgBlueThree,
42+
hoverBorderColor: primitives.colors.bgBlueTwo,
43+
color: primitives.colors.darkBlueTwo,
44+
hoverColor: primitives.colors.prBlueThree,
45+
},
4846
},
4947
},
5048
},

src/app/features/admin-institutions/components/admin-table/admin-table.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@
7070

7171
<div class="relative">
7272
<p-table
73+
class="institution-admin-table"
7374
[columns]="selectedColumnsComputed()"
7475
[value]="isLoading() ? skeletonData : tableData()"
7576
[scrollable]="true"
7677
[sortMode]="'single'"
77-
(onSort)="onSort($event)"
7878
[lazy]="true"
7979
[sortField]="sortField()"
8080
[sortOrder]="sortOrder()"
8181
[customSort]="true"
8282
[resetPageOnSort]="false"
83-
class="institution-admin-table"
83+
(onSort)="onSort($event)"
8484
>
8585
<ng-template #header let-columns>
8686
<tr>

src/app/features/admin-institutions/pages/institutions-preprints/institutions-preprints.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { TranslatePipe } from '@ngx-translate/core';
44

55
import { Button } from 'primeng/button';
66

7-
import { CommonModule } from '@angular/common';
7+
import { LowerCasePipe } from '@angular/common';
88
import { ChangeDetectionStrategy, Component, computed, OnDestroy, OnInit, signal } from '@angular/core';
99

1010
import { CurrentResourceType, ResourceType } from '@osf/shared/enums/resource-type.enum';
@@ -33,7 +33,7 @@ import { InstitutionsAdminSelectors } from '../../store';
3333

3434
@Component({
3535
selector: 'osf-institutions-preprints',
36-
imports: [CommonModule, AdminTableComponent, TranslatePipe, Button, FiltersSectionComponent],
36+
imports: [Button, AdminTableComponent, FiltersSectionComponent, LowerCasePipe, TranslatePipe],
3737
templateUrl: './institutions-preprints.component.html',
3838
styleUrl: './institutions-preprints.component.scss',
3939
changeDetection: ChangeDetectionStrategy.OnPush,

src/app/features/admin-institutions/pages/institutions-registrations/institutions-registrations.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { TranslatePipe } from '@ngx-translate/core';
44

55
import { Button } from 'primeng/button';
66

7-
import { CommonModule } from '@angular/common';
7+
import { LowerCasePipe } from '@angular/common';
88
import { ChangeDetectionStrategy, Component, computed, OnDestroy, OnInit, signal } from '@angular/core';
99

1010
import { CurrentResourceType, ResourceType } from '@osf/shared/enums/resource-type.enum';
@@ -34,7 +34,7 @@ import { InstitutionsAdminSelectors } from '../../store';
3434

3535
@Component({
3636
selector: 'osf-institutions-registrations',
37-
imports: [CommonModule, AdminTableComponent, TranslatePipe, Button, FiltersSectionComponent],
37+
imports: [Button, AdminTableComponent, FiltersSectionComponent, LowerCasePipe, TranslatePipe],
3838
templateUrl: './institutions-registrations.component.html',
3939
styleUrl: './institutions-registrations.component.scss',
4040
changeDetection: ChangeDetectionStrategy.OnPush,

src/app/features/auth/pages/forgot-password/forgot-password.component.html

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@ <h2 class="text-center">{{ 'auth.forgotPassword.title' | translate }}</h2>
2323

2424
<div class="my-4">
2525
@if (message()) {
26-
<p-message
27-
styleClass="w-full"
28-
[severity]="message()?.severity"
29-
closable="true"
30-
[text]="message()!.content | translate"
31-
(onClose)="onCloseMessage()"
32-
/>
26+
<p-message styleClass="w-full" [severity]="message()?.severity" closable="true" (onClose)="onCloseMessage()">
27+
{{ message()!.content | translate }}
28+
</p-message>
3329
}
3430
</div>
3531
</div>

src/app/features/auth/pages/reset-password/reset-password.component.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ <h2 class="text-center">{{ 'auth.resetPassword.title' | translate }}</h2>
88
<p-password
99
inputId="newPassword"
1010
formControlName="newPassword"
11-
styleClass="w-full"
1211
[toggleMask]="true"
1312
[feedback]="false"
1413
autocomplete="new-password"
@@ -22,7 +21,6 @@ <h2 class="text-center">{{ 'auth.resetPassword.title' | translate }}</h2>
2221
<p-password
2322
inputId="confirmNewPassword"
2423
formControlName="confirmNewPassword"
25-
styleClass="w-full"
2624
[toggleMask]="true"
2725
[feedback]="false"
2826
autocomplete="new-password"

src/app/features/auth/pages/sign-up/sign-up.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ <h2 class="text-center">{{ 'auth.signUp.title' | translate }}</h2>
8787
[toggleMask]="true"
8888
[feedback]="false"
8989
autocomplete="new-password"
90-
styleClass="w-full"
9190
></p-password>
9291
<osf-password-input-hint [control]="signUpForm.controls['password']" />
9392
</div>

src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ <h3>{{ 'collections.addToCollection.resourceMetadata' | translate }}</h3>
9292
/>
9393
@let license = selectedLicense();
9494
@if (license) {
95-
<p-divider styleClass="mt-3 mb-3" />
95+
<p-divider class="my-3" />
9696
@if (license.requiredFields.length) {
9797
<div class="flex flex-column gap-3 mb-3 w-full md:flex-row">
9898
<div class="w-full md:w-6">

src/app/features/files/pages/files/files.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<div class="flex flex-grow-0 w-full sm:w-30rem">
1212
@if (!isRegistration()) {
1313
<p-select
14+
class="w-full"
1415
inputId="in_label"
1516
[options]="rootFoldersOptions()"
1617
[(ngModel)]="currentRootFolder"
1718
(onChange)="handleRootFolderChange($event.value)"
18-
styleClass="w-full"
1919
variant="filled"
2020
>
2121
<ng-template #selectedItem let-selectedOption>

src/app/features/meetings/pages/meeting-details/meeting-details.component.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
[paginator]="true"
1919
[totalRecords]="tableParams().totalRecords"
2020
paginatorDropdownAppendTo="body"
21-
[resizableColumns]="true"
2221
[scrollable]="true"
2322
[sortMode]="'single'"
2423
[lazy]="true"
25-
[lazyLoadOnInit]="true"
2624
(onPage)="onPageChange($event)"
2725
(onSort)="onSort($event)"
2826
[sortField]="sortColumn()"

0 commit comments

Comments
 (0)