diff --git a/frontend/src/app/[organisation]/bemanning/page.tsx b/frontend/src/app/[organisation]/bemanning/page.tsx index 6563ced0..14d6f458 100644 --- a/frontend/src/app/[organisation]/bemanning/page.tsx +++ b/frontend/src/app/[organisation]/bemanning/page.tsx @@ -36,7 +36,7 @@ export default async function Bemanning({ > -
+

Bemanning

diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css index d9b1f564..b9fac6a4 100644 --- a/frontend/src/app/globals.css +++ b/frontend/src/app/globals.css @@ -115,6 +115,12 @@ line-height: 0.875rem; } + .interaction-button { + font-size: 0.9rem; + font-family: "Graphik-SemiBold"; + line-height: 1rem; + } + .detail-pill-text { font-size: 0.652rem; font-family: "Graphik-Regular"; diff --git a/frontend/src/components/ActiveFilters.tsx b/frontend/src/components/ActiveFilters.tsx index f98b4524..6332cb38 100644 --- a/frontend/src/components/ActiveFilters.tsx +++ b/frontend/src/components/ActiveFilters.tsx @@ -23,13 +23,13 @@ export default function ActiveFilters() { const filterSummaryText = filterTextComponents.join(", "); return ( - <> +
{filterSummaryText != "" && (
{" "}

{filterSummaryText}

)} - +
); } diff --git a/frontend/src/components/AvailabilityFilter.tsx b/frontend/src/components/AvailabilityFilter.tsx index ecfddf76..bc2c89b4 100644 --- a/frontend/src/components/AvailabilityFilter.tsx +++ b/frontend/src/components/AvailabilityFilter.tsx @@ -9,13 +9,11 @@ export default function AvailabilityFilter() { return (

Status

-
- toggleAvailabilityFilter(!availabilityFilterOn)} - checked={availabilityFilterOn} - /> -
+ toggleAvailabilityFilter(!availabilityFilterOn)} + checked={availabilityFilterOn} + />
); } diff --git a/frontend/src/components/DepartmentFilter.tsx b/frontend/src/components/DepartmentFilter.tsx index 76eb3b48..a0be17d6 100644 --- a/frontend/src/components/DepartmentFilter.tsx +++ b/frontend/src/components/DepartmentFilter.tsx @@ -18,21 +18,19 @@ export default function DepartmentFilter() { }); return ( -
-
-

Avdeling

-
- {departments?.map((department, index) => ( - toggleDepartmentFilter(department)} - checked={filteredDepartments - .map((d) => d.id) - .includes(department.id)} - /> - ))} -
+
+

Avdeling

+
+ {departments?.map((department, index) => ( + toggleDepartmentFilter(department)} + checked={filteredDepartments + .map((d) => d.id) + .includes(department.id)} + /> + ))}
); diff --git a/frontend/src/components/ExperienceFilter.tsx b/frontend/src/components/ExperienceFilter.tsx index 3a9b63bf..0637fcbb 100644 --- a/frontend/src/components/ExperienceFilter.tsx +++ b/frontend/src/components/ExperienceFilter.tsx @@ -16,21 +16,19 @@ export default function ExperienceFilter() { if (yearRanges.length > 0) { return ( -
-
-

Erfaring

-
- {yearRanges?.map((range, index) => ( - toggleYearFilter(range)} - checked={filteredYears - .map((y) => y.urlString) - .includes(range.urlString)} - /> - ))} -
+
+

Erfaring

+
+ {yearRanges?.map((range, index) => ( + toggleYearFilter(range)} + checked={filteredYears + .map((y) => y.urlString) + .includes(range.urlString)} + /> + ))}
); diff --git a/frontend/src/components/FilteredConsultantsList.tsx b/frontend/src/components/FilteredConsultantsList.tsx index ce9d4dc1..e9b61874 100644 --- a/frontend/src/components/FilteredConsultantsList.tsx +++ b/frontend/src/components/FilteredConsultantsList.tsx @@ -14,8 +14,8 @@ export default function FilteredConsultantList() { } return ( -
-
+
+
@@ -32,12 +32,9 @@ export default function FilteredConsultantList() {

Konsulenter

- -
-

- {consultants?.length} -

-
+

+ {consultants?.length} +

{consultants.at(0)?.bookings?.map((booking) => ( diff --git a/frontend/src/components/IconSecondaryButton.tsx b/frontend/src/components/IconSecondaryButton.tsx new file mode 100644 index 00000000..b5612829 --- /dev/null +++ b/frontend/src/components/IconSecondaryButton.tsx @@ -0,0 +1,18 @@ +import { ReactElement } from "react"; + +export default function IconSecondaryButton({ + icon, + onClick, +}: { + icon: ReactElement; + onClick?: () => void; +}) { + return ( + + ); +} diff --git a/frontend/src/components/InfoPillDescriptions.tsx b/frontend/src/components/InfoPillDescriptions.tsx index 30792ff4..dfb3e0b6 100644 --- a/frontend/src/components/InfoPillDescriptions.tsx +++ b/frontend/src/components/InfoPillDescriptions.tsx @@ -3,7 +3,7 @@ import { AlertTriangle, Calendar, Coffee, FileText, Sun } from "react-feather"; export default function InfoPillDescriptions() { return ( -
+
-
{label}
+ {label} ); } diff --git a/frontend/src/components/SearchBarComponent.tsx b/frontend/src/components/SearchBarComponent.tsx index c7cd1a99..c033f39f 100644 --- a/frontend/src/components/SearchBarComponent.tsx +++ b/frontend/src/components/SearchBarComponent.tsx @@ -49,10 +49,10 @@ export default function SearchBarComponent({ onFocus={() => console.log("F")} /> ) : ( -
+

Søk

setIsSearchActive(true)} onBlur={() => setIsSearchActive(false)} - > + />
)} diff --git a/frontend/src/components/SecondaryButton.tsx b/frontend/src/components/SecondaryButton.tsx index aff6093f..395bfa91 100644 --- a/frontend/src/components/SecondaryButton.tsx +++ b/frontend/src/components/SecondaryButton.tsx @@ -7,12 +7,10 @@ export default function SecondaryButton({ }) { return ( ); } diff --git a/frontend/src/components/StaffingSidebar.tsx b/frontend/src/components/StaffingSidebar.tsx index 6e0c294c..9b747a28 100644 --- a/frontend/src/components/StaffingSidebar.tsx +++ b/frontend/src/components/StaffingSidebar.tsx @@ -13,7 +13,7 @@ export default function StaffingSidebar() {
{!isSidebarHidden ? (
-
+

Filter