Skip to content

Commit

Permalink
Merge branch 'main' into radio-readonly-value
Browse files Browse the repository at this point in the history
  • Loading branch information
KenAJoh authored Oct 13, 2023
2 parents bf41ee0 + 7d67537 commit d75b890
Show file tree
Hide file tree
Showing 19 changed files with 72 additions and 35 deletions.
5 changes: 0 additions & 5 deletions .changeset/khaki-hats-mix.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silver-rice-rush.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/wild-coats-join.md

This file was deleted.

6 changes: 6 additions & 0 deletions @navikt/aksel-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @navikt/aksel-icons

## 5.7.0

### Minor Changes

- Ikoner: Nye ikoner `ChevronLeftFirstCircle` og `ChevronRightLastCircle` ([#2365](https://github.com/navikt/aksel/pull/2365))

## 5.6.5

## 5.6.4
Expand Down
2 changes: 1 addition & 1 deletion @navikt/aksel-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/aksel-icons",
"version": "5.6.5",
"version": "5.7.0",
"author": "Aksel | NAV",
"homepage": "https://aksel.nav.no/ikoner",
"repository": {
Expand Down
2 changes: 2 additions & 0 deletions @navikt/aksel-stylelint/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @navikt/aksel-stylelint

## 5.7.0

## 5.6.5

## 5.6.4
Expand Down
6 changes: 3 additions & 3 deletions @navikt/aksel-stylelint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/aksel-stylelint",
"version": "5.6.5",
"version": "5.7.0",
"author": "Aksel | NAV",
"homepage": "https://aksel.nav.no/grunnleggende/kode/stylelint",
"repository": {
Expand Down Expand Up @@ -35,8 +35,8 @@
"dev": "yarn watch:lint"
},
"devDependencies": {
"@navikt/ds-css": "^5.6.5",
"@navikt/ds-tokens": "^5.6.5",
"@navikt/ds-css": "^5.7.0",
"@navikt/ds-tokens": "^5.7.0",
"@types/jest": "^29.0.0",
"concurrently": "7.2.1",
"copyfiles": "2.4.1",
Expand Down
7 changes: 7 additions & 0 deletions @navikt/aksel/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @navikt/aksel

## 5.7.0

### Patch Changes

- Updated dependencies [[`70c5affbd`](https://github.com/navikt/aksel/commit/70c5affbd3bfb245e905043e7d3ae1c97eeef5e3)]:
- @navikt/ds-css@5.7.0

## 5.6.5

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions @navikt/aksel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/aksel",
"version": "5.6.5",
"version": "5.7.0",
"description": "Aksel command line interface. Handles css-imports, codemods and more",
"author": "Aksel | NAV designsystem team",
"license": "MIT",
Expand Down Expand Up @@ -29,7 +29,7 @@
},
"homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
"dependencies": {
"@navikt/ds-css": "5.6.5",
"@navikt/ds-css": "5.7.0",
"axios": "1.3.6",
"chalk": "4.1.0",
"clipboardy": "^2.3.0",
Expand Down
6 changes: 6 additions & 0 deletions @navikt/core/css/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @navikt/ds-css

## 5.7.0

### Patch Changes

- :lipstick: CopyButton: Justert padding, gap og animasjon ([#2355](https://github.com/navikt/aksel/pull/2355))

## 5.6.5

## 5.6.4
Expand Down
4 changes: 2 additions & 2 deletions @navikt/core/css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-css",
"version": "5.6.5",
"version": "5.7.0",
"description": "CSS for NAV Designsystem",
"author": "Aksel | NAV designsystem team",
"keywords": [
Expand All @@ -27,7 +27,7 @@
"css:get-version": "node config/get-version.js"
},
"devDependencies": {
"@navikt/ds-tokens": "^5.6.5",
"@navikt/ds-tokens": "^5.7.0",
"cssnano": "6.0.0",
"fast-glob": "3.2.11",
"lodash": "4.17.21",
Expand Down
12 changes: 12 additions & 0 deletions @navikt/core/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @navikt/ds-react

## 5.7.0

### Patch Changes

- Chores: Ryddet opp i sirkulære depdendencies ([#2366](https://github.com/navikt/aksel/pull/2366))

- :lipstick: CopyButton: Justert padding, gap og animasjon ([#2355](https://github.com/navikt/aksel/pull/2355))

- Updated dependencies [[`99fca2a56`](https://github.com/navikt/aksel/commit/99fca2a566e7464506f5d64ca1c8f11834cb63ef)]:
- @navikt/aksel-icons@5.7.0
- @navikt/ds-tokens@5.7.0

## 5.6.5

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions @navikt/core/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-react",
"version": "5.6.5",
"version": "5.7.0",
"description": "Aksel react-components for NAV designsystem",
"author": "Aksel | NAV designsystem team",
"license": "MIT",
Expand Down Expand Up @@ -38,8 +38,8 @@
},
"dependencies": {
"@floating-ui/react": "0.25.4",
"@navikt/aksel-icons": "^5.6.5",
"@navikt/ds-tokens": "^5.6.5",
"@navikt/aksel-icons": "^5.7.0",
"@navikt/ds-tokens": "^5.7.0",
"@radix-ui/react-tabs": "1.0.0",
"@radix-ui/react-toggle-group": "1.0.0",
"clsx": "^1.2.1",
Expand Down
2 changes: 2 additions & 0 deletions @navikt/core/tailwind/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @navikt/ds-tailwind

## 5.7.0

## 5.6.5

## 5.6.4
Expand Down
4 changes: 2 additions & 2 deletions @navikt/core/tailwind/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-tailwind",
"version": "5.6.5",
"version": "5.7.0",
"description": "Tailwind config based on @navikt/ds-tokens",
"author": "Aksel | NAV designsystem team",
"keywords": [
Expand All @@ -22,7 +22,7 @@
"directory": "@navikt/core/tailwind"
},
"devDependencies": {
"@navikt/ds-tokens": "^5.6.5",
"@navikt/ds-tokens": "^5.7.0",
"@types/jest": "^29.0.0",
"color": "4.2.3",
"jest": "^29.0.0",
Expand Down
2 changes: 2 additions & 0 deletions @navikt/core/tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @navikt/ds-tokens

## 5.7.0

## 5.6.5

## 5.6.4
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-tokens",
"version": "5.6.5",
"version": "5.7.0",
"description": "Design-tokens for NAV designsystem",
"author": "Aksel | NAV designsystem team",
"keywords": [
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## 5.7.0

### @navikt/aksel-icons

- Ikoner: Nye ikoner `ChevronLeftFirstCircle` og `ChevronRightLastCircle` ([#2365](https://github.com/navikt/aksel/pull/2365))

### @navikt/ds-react

- Chores: Ryddet opp i sirkulære depdendencies ([#2366](https://github.com/navikt/aksel/pull/2366))

- :lipstick: CopyButton: Justert padding, gap og animasjon ([#2355](https://github.com/navikt/aksel/pull/2355))

### @navikt/ds-css

- :lipstick: CopyButton: Justert padding, gap og animasjon ([#2355](https://github.com/navikt/aksel/pull/2355))

## 5.6.5

### @navikt/ds-react
Expand Down
10 changes: 5 additions & 5 deletions aksel.nav.no/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"website"
],
"dependencies": {
"@navikt/aksel-icons": "^5.6.5",
"@navikt/ds-css": "^5.6.5",
"@navikt/ds-react": "^5.6.5",
"@navikt/ds-tailwind": "^5.6.5",
"@navikt/ds-tokens": "^5.6.5"
"@navikt/aksel-icons": "^5.7.0",
"@navikt/ds-css": "^5.7.0",
"@navikt/ds-react": "^5.7.0",
"@navikt/ds-tailwind": "^5.7.0",
"@navikt/ds-tokens": "^5.7.0"
},
"devDependencies": {
"prettier-plugin-tailwindcss": "^0.2.3"
Expand Down

0 comments on commit d75b890

Please sign in to comment.