Merge fd0623a into 299c5f1

navikt · Feb 26, 2024 · 8b7538d · 8b7538d
2 parents 299c5f1 + fd0623a
commit 8b7538d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.changeset/healthy-penguins-stare.md b/.changeset/healthy-penguins-stare.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-react": patch
+---
+
+Modal: Endre title på lukkeknapp til bare 'Lukk'
diff --git a/.changeset/tidy-toys-kiss.md b/.changeset/tidy-toys-kiss.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-css": patch
+---
+
+Modal: Får nå fokus når åpnes i Safari
diff --git a/@navikt/core/css/modal.css b/@navikt/core/css/modal.css
@@ -146,7 +146,7 @@
 
 @keyframes akselModalFadeIn {
   from {
-    opacity: 0;
+    opacity: 0.0001; /* Safari will not set focus inside the modal when it opens if we set this to 0 */
     transform: translate3d(0, calc(5% + 4px), 0);
   }
 

diff --git a/@navikt/core/react/src/modal/ModalHeader.tsx b/@navikt/core/react/src/modal/ModalHeader.tsx
@@ -26,7 +26,7 @@ const ModalHeader = forwardRef<HTMLDivElement, ModalHeaderProps>(
             size="small"
             variant="tertiary-neutral"
             onClick={context.closeHandler}
-            icon={<XMarkIcon title="Lukk modalvindu" />}
+            icon={<XMarkIcon title="Lukk" />}
           />
         )}
         {children}