Merge pull request #27 from navikt/feature/adjustments

minor adjustments
navikt · Jan 25, 2024 · fdbe58f · fdbe58f
2 parents 5f93019 + c2a734e
commit fdbe58f
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 62 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, { useEffect } from "react";
-import { Link } from "@navikt/ds-react";
+import { Link, Heading } from "@navikt/ds-react";
 import ArbeidsplassenLogoSmall from "../Logo/ArbeidsplassenLogoSmall";
 
 export default function Footer() {
@@ -23,7 +23,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>
@@ -43,7 +45,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">
@@ -65,7 +69,9 @@ export default function Footer() {
           </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/package.json b/src/packages/arbeidsplassen-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/arbeidsplassen-react",
-  "version": "8.2.9",
+  "version": "8.2.10",
   "main": "dist/index.js",
   "private": false,
   "scripts": {

diff --git a/src/packages/arbeidsplassen-theme/common.css b/src/packages/arbeidsplassen-theme/common.css
@@ -65,6 +65,24 @@
   letter-spacing: -0.019em !important;
 }
 
+/******************************************************
+ * Paragraph overrides
+ ******************************************************/
+
+.navds-body-long,
+.navds-body-short {
+  letter-spacing: -0.011em !important;
+}
+
+.navds-body-long.navds-body-long--small,
+.navds-body-short.navds-body-short--small {
+  letter-spacing: -0.006em !important;
+}
+
+.navds-label {
+  letter-spacing: -0.11em !important;
+}
+
 /******************************************************
  * Button overrides
  ******************************************************/