Merge remote-tracking branch 'origin/main'

# Conflicts: # src/packages/arbeidsplassen-react/Footer/Footer.js # src/packages/arbeidsplassen-react/package.json
navikt · Feb 12, 2024 · 2678329 · 2678329
2 parents d51e3a6 + 90c48ea
commit 2678329
Show file tree

Hide file tree

Showing 22 changed files with 115 additions and 84 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/packages/arbeidsplassen-css/footer.css b/src/packages/arbeidsplassen-css/footer.css
@@ -47,20 +47,9 @@
 }
 
 .arb-footer-h2 {
-  font-weight: 600;
-  font-size: 1.25rem;
-  line-height: 1.75rem;
-  margin: 0 0 1rem 0;
   color: var(--arb-footer-text);
 }
 
-@media (min-width: 960px) {
-  .arb-footer-h2 {
-    font-size: 1.5rem;
-    line-height: 2rem;
-  }
-}
-
 .arb-footer-section ul {
   list-style: none;
   margin: 0;

diff --git a/src/packages/arbeidsplassen-react/Footer/Footer.js b/src/packages/arbeidsplassen-react/Footer/Footer.js
@@ -1,5 +1,5 @@
 import React from "react";
-import { Link } from "@navikt/ds-react";
+import { Link, Heading } from "@navikt/ds-react";
 import ArbeidsplassenLogoSmall from "../Logo/ArbeidsplassenLogoSmall";
 
 export default function Footer() {
@@ -8,7 +8,9 @@ export default function Footer() {
       <div className="container-large">
         <nav className="arb-footer-sections">
           <section className="arb-footer-section">
-            <h2 className="arb-footer-h2">Om oss</h2>
+            <Heading level="2" size="medium" spacing className="arb-footer-h2">
+              Om oss
+            </Heading>
             <ul aria-label="Nyttige lenker">
               <li>
                 <Link href="/kontakt">Kontakt oss</Link>
@@ -28,7 +30,9 @@ export default function Footer() {
           </section>
 
           <section className="arb-footer-section">
-            <h2 className="arb-footer-h2">For jobbsøkere</h2>
+            <Heading level="2" size="medium" spacing className="arb-footer-h2">
+              For jobbsøkere
+            </Heading>
             <ul aria-label="Nyttige lenker for jobbsøkere">
               <li>
                 <Link href="/nyttige-artikler-for-jobbsokere">
@@ -42,15 +46,17 @@ export default function Footer() {
                 <Link href="/jobbe-i-utlandet">Jobbe i utlandet</Link>
               </li>
               <li>
-                <Link href="/en/work-in-norway">
+                <Link href="/en/work-in-norway" lang="en">
                   Information to refugees from Ukraine
                 </Link>
               </li>
             </ul>
           </section>
 
           <section className="arb-footer-section">
-            <h2 className="arb-footer-h2">For bedrifter</h2>
+            <Heading level="2" size="medium" spacing className="arb-footer-h2">
+              For bedrifter
+            </Heading>
             <ul aria-label="Nyttige lenker for bedrifter">
               <li>
                 <Link href="/vilkar-og-retningslinjer">

diff --git a/src/packages/arbeidsplassen-react/illustrations/CelebratingFigure.jsx b/src/packages/arbeidsplassen-react/illustrations/CelebratingFigure.jsx
@@ -144,7 +144,7 @@ export default function CelebratingFigure({
           y2="81.1372"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#EE7D7A" />
+          <stop offset="0" stopColor="#EE7D7A" />
           <stop offset="1" stopColor="#E36E6B" />
         </linearGradient>
         <clipPath id="clip0_2680_48962">

diff --git a/src/packages/arbeidsplassen-react/illustrations/ConfusedFigure.jsx b/src/packages/arbeidsplassen-react/illustrations/ConfusedFigure.jsx
@@ -118,7 +118,7 @@ export default function ConfusedFigure({
           y2="132.641"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#9CA8F5" />
+          <stop offset="0" stopColor="#9CA8F5" />
           <stop offset="1" stopColor="#717DC7" />
         </linearGradient>
         <clipPath id="clip0_1106_13559">

diff --git a/src/packages/arbeidsplassen-react/illustrations/FigureHoldingAHeart.jsx b/src/packages/arbeidsplassen-react/illustrations/FigureHoldingAHeart.jsx
@@ -74,7 +74,7 @@ function FigureHoldingAHeart({
           y2="168.349"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#FFB682" />
+          <stop offset="0" stopColor="#FFB682" />
           <stop offset="1" stopColor="#EDA572" />
         </linearGradient>
         <clipPath id="clip0_2719_77107">

diff --git a/src/packages/arbeidsplassen-react/illustrations/FigureJugglingShieldWithCheckmark.jsx b/src/packages/arbeidsplassen-react/illustrations/FigureJugglingShieldWithCheckmark.jsx
@@ -115,7 +115,7 @@ function FigureJugglingShieldWithCheckmark({
           y2="117.468"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#EE7D7A" />
+          <stop offset="0" stopColor="#EE7D7A" />
           <stop offset="1" stopColor="#E36E6B" />
         </linearGradient>
         <clipPath id="clip0_2752_84126">

diff --git a/src/packages/arbeidsplassen-react/illustrations/FigureWithEnvelope.jsx b/src/packages/arbeidsplassen-react/illustrations/FigureWithEnvelope.jsx
@@ -134,7 +134,7 @@ export default function FigureWithEnvelope({
           y2="100.168"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#EE7D7A" />
+          <stop offset="0" stopColor="#EE7D7A" />
           <stop offset="1" stopColor="#E36E6B" />
         </linearGradient>
         <clipPath id="clip0_4436_281">

diff --git a/src/packages/arbeidsplassen-react/illustrations/FigureWithKey.jsx b/src/packages/arbeidsplassen-react/illustrations/FigureWithKey.jsx
@@ -117,7 +117,7 @@ export default function FigureWithKey({
           y2="100.588"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#EE7D7A" />
+          <stop offset="0" stopColor="#EE7D7A" />
           <stop offset="1" stopColor="#E36E6B" />
         </linearGradient>
         <clipPath id="clip0_1509_20576">

diff --git a/src/packages/arbeidsplassen-react/illustrations/FigureWithMagnifier.jsx b/src/packages/arbeidsplassen-react/illustrations/FigureWithMagnifier.jsx
@@ -108,7 +108,7 @@ export default function FigureWithMagnifier({
           y2="89.7623"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#90E8C3" />
+          <stop offset="0" stopColor="#90E8C3" />
           <stop offset="1" stopColor="#7CCCAB" />
         </linearGradient>
       </defs>

diff --git a/src/packages/arbeidsplassen-react/illustrations/FiguresGivingHighFive.jsx b/src/packages/arbeidsplassen-react/illustrations/FiguresGivingHighFive.jsx
@@ -187,7 +187,7 @@ export default function FiguresGivingHighFive({
           y2="95.1964"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#EE7D7A" />
+          <stop offset="0" stopColor="#EE7D7A" />
           <stop offset="1" stopColor="#E36E6B" />
         </linearGradient>
         <linearGradient
@@ -198,7 +198,7 @@ export default function FiguresGivingHighFive({
           y2="89.7623"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#90E8C3" />
+          <stop offset="0" stopColor="#90E8C3" />
           <stop offset="1" stopColor="#7CCCAB" />
         </linearGradient>
         <clipPath id="clip0_1161_13117">

diff --git a/src/packages/arbeidsplassen-react/illustrations/FiguresSideBySide.jsx b/src/packages/arbeidsplassen-react/illustrations/FiguresSideBySide.jsx
@@ -184,7 +184,7 @@ export default function FiguresSideBySide({
           y2="169.271"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#FFB682" />
+          <stop offset="0" stopColor="#FFB682" />
           <stop offset="1" stopColor="#EDA572" />
         </linearGradient>
         <linearGradient
@@ -195,7 +195,7 @@ export default function FiguresSideBySide({
           y2="179.507"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#9CA8F5" />
+          <stop offset="0" stopColor="#9CA8F5" />
           <stop offset="1" stopColor="#717DC7" />
         </linearGradient>
         <clipPath id="clip0_1046_13268">

diff --git a/src/packages/arbeidsplassen-react/illustrations/WavingFigure.jsx b/src/packages/arbeidsplassen-react/illustrations/WavingFigure.jsx
@@ -107,7 +107,7 @@ export default function WavingFigure({
           y2="89.7623"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="#90E8C3" />
+          <stop offset="0" stopColor="#90E8C3" />
           <stop offset="1" stopColor="#7CCCAB" />
         </linearGradient>
         <clipPath id="clip0_1741_26769">