diff --git a/src/app/features/project/files/project-files.component.ts b/src/app/features/project/files/project-files.component.ts
index 45c30c606..d7727335b 100644
--- a/src/app/features/project/files/project-files.component.ts
+++ b/src/app/features/project/files/project-files.component.ts
@@ -1,5 +1,4 @@
import { Button } from 'primeng/button';
-import { DropdownModule } from 'primeng/dropdown';
import { FloatLabel } from 'primeng/floatlabel';
import { Select } from 'primeng/select';
import { TableModule } from 'primeng/table';
@@ -14,16 +13,7 @@ import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.com
@Component({
selector: 'osf-project-files',
- imports: [
- TableModule,
- DropdownModule,
- Button,
- DatePipe,
- Select,
- FloatLabel,
- SubHeaderComponent,
- SearchInputComponent,
- ],
+ imports: [TableModule, Button, DatePipe, Select, FloatLabel, SubHeaderComponent, SearchInputComponent],
templateUrl: './project-files.component.html',
styleUrl: './project-files.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/project/settings/components/accordion-table/accordion-table.component.html b/src/app/features/project/settings/components/accordion-table/accordion-table.component.html
index bfb6d0a56..918ce5a7a 100644
--- a/src/app/features/project/settings/components/accordion-table/accordion-table.component.html
+++ b/src/app/features/project/settings/components/accordion-table/accordion-table.component.html
@@ -19,7 +19,7 @@
@switch (control.type) {
@case ('dropdown') {
-
{{ 'settings.notifications.notificationPreferences.items.replies' | translate }}
-
+
{{ 'settings.notifications.notificationPreferences.items.comments' | translate }}
-
+
{{ 'settings.notifications.notificationPreferences.items.files' | translate }}
-
+
{{ 'settings.notifications.notificationPreferences.items.mentions' | translate }}
-
+
{{ 'settings.notifications.notificationPreferences.items.preprints' | translate }}
-
+
diff --git a/src/app/features/settings/notifications/notifications.component.ts b/src/app/features/settings/notifications/notifications.component.ts
index d6b6358fd..24295259a 100644
--- a/src/app/features/settings/notifications/notifications.component.ts
+++ b/src/app/features/settings/notifications/notifications.component.ts
@@ -2,7 +2,7 @@ import { TranslatePipe } from '@ngx-translate/core';
import { Button } from 'primeng/button';
import { Checkbox } from 'primeng/checkbox';
-import { DropdownModule } from 'primeng/dropdown';
+import { SelectModule } from 'primeng/select';
import { ChangeDetectionStrategy, Component, HostBinding } from '@angular/core';
@@ -10,7 +10,7 @@ import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.com
@Component({
selector: 'osf-notifications',
- imports: [SubHeaderComponent, Checkbox, Button, DropdownModule, TranslatePipe],
+ imports: [SubHeaderComponent, Checkbox, Button, SelectModule, TranslatePipe],
templateUrl: './notifications.component.html',
styleUrl: './notifications.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/settings/profile-settings/profile-settings.component.ts b/src/app/features/settings/profile-settings/profile-settings.component.ts
index 5c70c4ea7..0896babec 100644
--- a/src/app/features/settings/profile-settings/profile-settings.component.ts
+++ b/src/app/features/settings/profile-settings/profile-settings.component.ts
@@ -1,6 +1,5 @@
import { TranslatePipe } from '@ngx-translate/core';
-import { DropdownModule } from 'primeng/dropdown';
import { Select } from 'primeng/select';
import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs';
@@ -25,7 +24,6 @@ import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.com
Tab,
TabPanel,
TabPanels,
- DropdownModule,
ReactiveFormsModule,
Select,
FormsModule,
diff --git a/src/app/features/settings/profile-settings/social/social.component.html b/src/app/features/settings/profile-settings/social/social.component.html
index 11f5d1d82..4dc3f7ce7 100644
--- a/src/app/features/settings/profile-settings/social/social.component.html
+++ b/src/app/features/settings/profile-settings/social/social.component.html
@@ -24,12 +24,12 @@
{{ 'settings.profileSettings.social.socialOutput' | translate }}
-
+ >
diff --git a/src/app/features/settings/profile-settings/social/social.component.ts b/src/app/features/settings/profile-settings/social/social.component.ts
index cfcc2bd14..e0608714b 100644
--- a/src/app/features/settings/profile-settings/social/social.component.ts
+++ b/src/app/features/settings/profile-settings/social/social.component.ts
@@ -3,10 +3,10 @@ import { Store } from '@ngxs/store';
import { TranslatePipe } from '@ngx-translate/core';
import { Button } from 'primeng/button';
-import { DropdownModule } from 'primeng/dropdown';
import { InputGroup } from 'primeng/inputgroup';
import { InputGroupAddon } from 'primeng/inputgroupaddon';
import { InputText } from 'primeng/inputtext';
+import { SelectModule } from 'primeng/select';
import { ChangeDetectionStrategy, Component, effect, HostBinding, inject } from '@angular/core';
import { FormArray, FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -24,7 +24,7 @@ import {
@Component({
selector: 'osf-social',
- imports: [Button, DropdownModule, InputGroup, InputGroupAddon, InputText, ReactiveFormsModule, TranslatePipe],
+ imports: [Button, SelectModule, InputGroup, InputGroupAddon, InputText, ReactiveFormsModule, TranslatePipe],
templateUrl: './social.component.html',
styleUrl: './social.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -45,9 +45,7 @@ export class SocialComponent {
const socialLinks = this.socialLinks();
for (const socialLinksKey in socialLinks) {
- console.log(socialLinksKey);
const socialLink = socialLinks[socialLinksKey as SocialLinksKeys];
- console.log(socialLink);
const socialLinkGroup = this.#fb.group({
socialOutput: [this.socials.find((social) => social.key === socialLinksKey), Validators.required],
diff --git a/src/app/shared/components/add-project-form/add-project-form.component.ts b/src/app/shared/components/add-project-form/add-project-form.component.ts
index 22e8b76dd..a88768215 100644
--- a/src/app/shared/components/add-project-form/add-project-form.component.ts
+++ b/src/app/shared/components/add-project-form/add-project-form.component.ts
@@ -4,7 +4,6 @@ import { TranslatePipe } from '@ngx-translate/core';
import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
-import { DropdownModule } from 'primeng/dropdown';
import { DynamicDialogRef } from 'primeng/dynamicdialog';
import { InputTextModule } from 'primeng/inputtext';
import { Select } from 'primeng/select';
@@ -30,7 +29,6 @@ import { IS_XSMALL } from '@shared/utils/breakpoints.tokens';
ReactiveFormsModule,
ButtonModule,
InputTextModule,
- DropdownModule,
CheckboxModule,
Select,
Textarea,
diff --git a/src/app/shared/components/resources/resource-card/resource-card.component.html b/src/app/shared/components/resources/resource-card/resource-card.component.html
index 92174acce..74bfd69c9 100644
--- a/src/app/shared/components/resources/resource-card/resource-card.component.html
+++ b/src/app/shared/components/resources/resource-card/resource-card.component.html
@@ -11,12 +11,12 @@
@if (item()?.resourceType === ResourceType.File && item()?.fileName) {
-
{{ item()?.fileName }}
+
{{ item()?.fileName }}
} @else if (item()?.title && item()?.title) {
-
{{ item()?.title }}
+
{{ item()?.title }}
}
@if (item()?.orcid) {
-
+
![orcid]()
}
@@ -25,7 +25,7 @@
@if (item()?.creators?.length) {
@for (creator of item()?.creators!.slice(0, 4); track creator.id; let i = $index) {
-
{{ creator.name }}
+
{{ creator.name }}
@if (i < (item()?.creators)!.length - 1 && i < 3) {
,
}
@@ -39,7 +39,7 @@
@if (item()?.from?.id && item()?.from?.name) {
}
@@ -62,7 +62,7 @@
@if (item()?.resourceType === ResourceType.Registration) {
-
+
@if (item()?.hasDataResource) {
} @else {
@@ -70,7 +70,7 @@
}
Data
-
+
@if (item()?.hasAnalyticCodeResource) {
} @else {
@@ -78,7 +78,7 @@
}
Analytic Code
-
+
@if (item()?.hasMaterialsResource) {
} @else {
@@ -86,7 +86,7 @@
}
Materials
-
+
@if (item()?.hasPapersResource) {
} @else {
@@ -94,7 +94,7 @@
}
Papers
-
+
@if (item()?.hasPapersResource) {
} @else {
@@ -115,7 +115,7 @@
@if (item()?.provider?.id) {
Registration provider:
- {{ item()?.provider?.name }}
+ {{ item()?.provider?.name }}
}
@@ -133,7 +133,7 @@
@if (item()?.provider?.id) {
Provider:
- {{ item()?.provider?.name }}
+ {{ item()?.provider?.name }}
}
@@ -144,7 +144,7 @@
@if (item()?.resourceType !== ResourceType.Agent && item()?.id) {
URL:
- {{ item()?.id }}
+ {{ item()?.id }}
}
diff --git a/src/app/shared/components/resources/resources.component.ts b/src/app/shared/components/resources/resources.component.ts
index 4af5be4f1..0ddb03178 100644
--- a/src/app/shared/components/resources/resources.component.ts
+++ b/src/app/shared/components/resources/resources.component.ts
@@ -3,7 +3,6 @@ import { Store } from '@ngxs/store';
import { AccordionModule } from 'primeng/accordion';
import { AutoCompleteModule } from 'primeng/autocomplete';
import { DataViewModule } from 'primeng/dataview';
-import { DropdownModule } from 'primeng/dropdown';
import { Select } from 'primeng/select';
import { TableModule } from 'primeng/table';
@@ -24,7 +23,6 @@ import { IS_WEB, IS_XSMALL } from '@shared/utils/breakpoints.tokens';
@Component({
selector: 'osf-resources',
imports: [
- DropdownModule,
FormsModule,
ResourceFiltersComponent,
ReactiveFormsModule,
diff --git a/src/assets/styles/overrides/dropdown.scss b/src/assets/styles/overrides/dropdown.scss
deleted file mode 100644
index dbbe388a4..000000000
--- a/src/assets/styles/overrides/dropdown.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
-
-.p-dropdown {
- height: 3.125rem;
- border: 1px solid var(--grey-2);
- border-radius: 0.57rem;
- outline: none;
- font-size: 16px;
- color: var.$dark-blue-1;
-
- .p-select-label {
- @include mix.flex-align-center;
- }
-
- .p-select-option {
- color: var.$dark-blue-1;
- &.p-select-option-selected.p-focus {
- background: var.$bg-blue-2;
- }
- }
-
- &.accordion-dropdown {
- border: none;
- box-shadow: none;
- min-width: 120px;
- width: max-content;
- max-width: 300px;
- font-size: 1rem;
-
- @media (max-width: 575px) {
- max-width: 240px;
- }
- }
-}
diff --git a/src/assets/styles/overrides/select.scss b/src/assets/styles/overrides/select.scss
index f76e51775..0d0bab998 100644
--- a/src/assets/styles/overrides/select.scss
+++ b/src/assets/styles/overrides/select.scss
@@ -12,6 +12,19 @@
.p-placeholder {
color: var.$grey-1;
}
+
+ &.accordion-dropdown {
+ border: none;
+ box-shadow: none;
+ min-width: 120px;
+ width: max-content;
+ max-width: 300px;
+ font-size: 1rem;
+
+ @media (max-width: 575px) {
+ max-width: 240px;
+ }
+ }
}
.p-select-label {
diff --git a/src/assets/styles/styles.scss b/src/assets/styles/styles.scss
index a45c85b76..73a26186a 100644
--- a/src/assets/styles/styles.scss
+++ b/src/assets/styles/styles.scss
@@ -20,7 +20,6 @@
@use "./overrides/panel-menu";
@use "./overrides/stepper";
@use "./overrides/radio";
-@use "./overrides/dropdown";
@use "./overrides/confirmation-dialog";
@use "./overrides/input-group-addon";
@use "./overrides/iconfield";