Merge branch 'main' into icon-update-0412

navikt · Dec 13, 2023 · 193ed90 · 193ed90
2 parents 65d5caf + 3de1aac
commit 193ed90
Show file tree

Hide file tree

Showing 47 changed files with 28,549 additions and 28,688 deletions.
diff --git a/@navikt/aksel-icons/CHANGELOG.md b/@navikt/aksel-icons/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/aksel-icons
 
+## 5.11.5
+
 ## 5.11.4
 
 ## 5.11.3

diff --git a/@navikt/aksel-icons/figma-plugin/package.json b/@navikt/aksel-icons/figma-plugin/package.json
@@ -28,7 +28,7 @@
     "postcss": "^8.4.31",
     "postcss-url": "^10.1.3",
     "typescript": "^5.1.6",
-    "vite": "^4.2.0",
+    "vite": "^4.5.1",
     "vite-plugin-singlefile": "^0.13.3",
     "vite-plugin-svgr": "^2.4.0"
   }

diff --git a/@navikt/aksel-icons/package.json b/@navikt/aksel-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-icons",
-  "version": "5.11.4",
+  "version": "5.11.5",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/ikoner",
   "repository": {

diff --git a/@navikt/aksel-stylelint/CHANGELOG.md b/@navikt/aksel-stylelint/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/aksel-stylelint
 
+## 5.11.5
+
 ## 5.11.4
 
 ## 5.11.3

diff --git a/@navikt/aksel-stylelint/package.json b/@navikt/aksel-stylelint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-stylelint",
-  "version": "5.11.4",
+  "version": "5.11.5",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/grunnleggende/kode/stylelint",
   "repository": {
@@ -35,8 +35,8 @@
     "dev": "yarn watch:lint"
   },
   "devDependencies": {
-    "@navikt/ds-css": "^5.11.4",
-    "@navikt/ds-tokens": "^5.11.4",
+    "@navikt/ds-css": "^5.11.5",
+    "@navikt/ds-tokens": "^5.11.5",
     "@types/jest": "^29.0.0",
     "concurrently": "7.2.1",
     "copyfiles": "2.4.1",

diff --git a/@navikt/aksel/CHANGELOG.md b/@navikt/aksel/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @navikt/aksel
 
+## 5.11.5
+
+### Patch Changes
+
+- Updated dependencies [[`e77206da1`](https://github.com/navikt/aksel/commit/e77206da1ad1e4b55efd8ec384bd627604eaa08f)]:
+  - @navikt/ds-css@5.11.5
+
 ## 5.11.4
 
 ### Patch Changes

diff --git a/@navikt/aksel/package.json b/@navikt/aksel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "5.11.4",
+  "version": "5.11.5",
   "description": "Aksel command line interface. Handles css-imports, codemods and more",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
   "dependencies": {
-    "@navikt/ds-css": "5.11.4",
+    "@navikt/ds-css": "5.11.5",
     "axios": "1.6.0",
     "chalk": "4.1.0",
     "clipboardy": "^2.3.0",

diff --git a/@navikt/core/css/CHANGELOG.md b/@navikt/core/css/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @navikt/ds-css
 
+## 5.11.5
+
+### Patch Changes
+
+- Chips: La til token for checkmark-circle ([#2558](https://github.com/navikt/aksel/pull/2558))
+
 ## 5.11.4
 
 ### Patch Changes

diff --git a/@navikt/core/css/package.json b/@navikt/core/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-css",
-  "version": "5.11.4",
+  "version": "5.11.5",
   "description": "CSS for NAV Designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -27,7 +27,7 @@
     "css:get-version": "node config/get-version.js"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^5.11.4",
+    "@navikt/ds-tokens": "^5.11.5",
     "cssnano": "6.0.0",
     "fast-glob": "3.2.11",
     "lodash": "4.17.21",

diff --git a/@navikt/core/css/tokens.json b/@navikt/core/css/tokens.json
@@ -102,6 +102,7 @@
     "--ac-chip-toggle-neutral-pressed-bg": "--a-surface-neutral-selected",
     "--ac-chip-toggle-neutral-pressed-text": "--a-text-on-neutral",
     "--ac-chip-toggle-neutral-pressed-hover-bg": "--a-surface-neutral-selected",
+    "--ac-chip-toggle-circle-border": "--a-border-default",
     "--ac-chip-toggle-focus": "--a-border-focus",
     "--ac-chip-removable-action-bg": "--a-surface-action-selected",
     "--ac-chip-removable-action-text": "--a-text-on-action",

diff --git a/@navikt/core/react/CHANGELOG.md b/@navikt/core/react/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @navikt/ds-react
 
+## 5.11.5
+
+### Patch Changes
+
+- Chips: La til token for checkmark-circle ([#2558](https://github.com/navikt/aksel/pull/2558))
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.11.5
+  - @navikt/aksel-icons@5.11.5
+
 ## 5.11.4
 
 ### Patch Changes

diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react",
-  "version": "5.11.4",
+  "version": "5.11.5",
   "description": "Aksel react-components for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -38,8 +38,8 @@
   },
   "dependencies": {
     "@floating-ui/react": "0.25.4",
-    "@navikt/aksel-icons": "^5.11.4",
-    "@navikt/ds-tokens": "^5.11.4",
+    "@navikt/aksel-icons": "^5.11.5",
+    "@navikt/ds-tokens": "^5.11.5",
     "@radix-ui/react-tabs": "1.0.0",
     "@radix-ui/react-toggle-group": "1.0.0",
     "clsx": "^1.2.1",

diff --git a/@navikt/core/react/src/chips/Toggle.tsx b/@navikt/core/react/src/chips/Toggle.tsx
@@ -73,7 +73,7 @@ export const ToggleChips: OverridableComponent<
                 fillRule="evenodd"
                 clipRule="evenodd"
                 d="M10 3.125C6.20304 3.125 3.125 6.20304 3.125 10C3.125 13.797 6.20304 16.875 10 16.875C13.797 16.875 16.875 13.797 16.875 10C16.875 6.20304 13.797 3.125 10 3.125ZM1.875 10C1.875 5.51269 5.51269 1.875 10 1.875C14.4873 1.875 18.125 5.51269 18.125 10C18.125 14.4873 14.4873 18.125 10 18.125C5.51269 18.125 1.875 14.4873 1.875 10Z"
-                fill="var(--a-border-default)"
+                fill="var(--ac-chip-toggle-circle-border, var(--a-border-default))"
               />
             )}
           </svg>

diff --git a/@navikt/core/tailwind/CHANGELOG.md b/@navikt/core/tailwind/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tailwind
 
+## 5.11.5
+
 ## 5.11.4
 
 ## 5.11.3

diff --git a/@navikt/core/tailwind/package.json b/@navikt/core/tailwind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tailwind",
-  "version": "5.11.4",
+  "version": "5.11.5",
   "description": "Tailwind config based on @navikt/ds-tokens",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -24,7 +24,7 @@
     "directory": "@navikt/core/tailwind"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^5.11.4",
+    "@navikt/ds-tokens": "^5.11.5",
     "@types/jest": "^29.0.0",
     "color": "4.2.3",
     "jest": "^29.0.0",

diff --git a/@navikt/core/tokens/CHANGELOG.md b/@navikt/core/tokens/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tokens
 
+## 5.11.5
+
 ## 5.11.4
 
 ## 5.11.3

diff --git a/@navikt/core/tokens/package.json b/@navikt/core/tokens/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tokens",
-  "version": "5.11.4",
+  "version": "5.11.5",
   "description": "Design-tokens for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [