Merge 982ff7d into 4a68409

navikt · Nov 16, 2023 · 4ccd246 · 4ccd246
2 parents 4a68409 + 982ff7d
commit 4ccd246
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/dull-lions-sort.md b/.changeset/dull-lions-sort.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-css": patch
+---
+
+Primtives: CSS-import for primitives er nå mer spesifikk
diff --git a/@navikt/core/css/config/_mappings.js b/@navikt/core/css/config/_mappings.js
@@ -187,7 +187,7 @@ const StyleMappings = {
     {
       component: "DatePicker",
       main: "date.css",
-      dependencies: [typoCss, primitivesCss, "button.css", "popover.css"],
+      dependencies: [typoCss, "button.css", "popover.css", primitivesCss],
     },
     {
       component: "MonthPicker",

diff --git a/@navikt/core/css/index.css b/@navikt/core/css/index.css
@@ -1,7 +1,6 @@
 @charset "UTF-8";
 @import "baseline/index.css";
 @import "typography.css";
-@import "primitives/index.css";
 @import "grid.css";
 @import "accordion.css";
 @import "alert.css";
@@ -34,3 +33,4 @@
 @import "table.css";
 @import "tabs.css";
 @import "list.css";
+@import "primitives/index.css";
diff --git a/@navikt/core/react/src/layout/bleed/Bleed.stories.tsx b/@navikt/core/react/src/layout/bleed/Bleed.stories.tsx
@@ -1,8 +1,8 @@
-import React from "react";
 import type { Meta } from "@storybook/react";
+import React from "react";
+import { Box, HStack, VStack } from "../..";
 import { BodyLong } from "../../typography";
 import { Bleed } from "./Bleed";
-import { Box, HStack, VStack } from "../..";
 
 export default {
   title: "ds-react/Primitives/Bleed",