Skip to content

Commit

Permalink
Merge branch 'main' into datepicker-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
KenAJoh authored Mar 31, 2023
2 parents 2b55aac + b5c8a94 commit 7353e77
Show file tree
Hide file tree
Showing 22 changed files with 62 additions and 33 deletions.
5 changes: 0 additions & 5 deletions .changeset/eleven-waves-destroy.md

This file was deleted.

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

## 2.8.9

## 2.8.8

### Patch Changes
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": "2.8.8",
"version": "2.8.9",
"author": "Aksel | NAV",
"homepage": "https://aksel.nav.no/ikoner",
"repository": {
Expand Down
2 changes: 2 additions & 0 deletions @navikt/codemod/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @navikt/ds-codemod

## 2.8.9

## 2.8.8

## 2.8.7
Expand Down
2 changes: 1 addition & 1 deletion @navikt/codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-codemod",
"version": "2.8.8",
"version": "2.8.9",
"description": "Aksel codemods for NAVs designsystem",
"author": "Aksel | NAV designsystem team",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions @navikt/community/navno/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"build-pict": "svgr --silent --index-template index-template.js --out-dir src/pictograms pictograms"
},
"dependencies": {
"@navikt/ds-icons": "^2.8.8",
"@navikt/ds-react": "^2.8.8",
"@navikt/ds-icons": "^2.8.9",
"@navikt/ds-react": "^2.8.9",
"clsx": "^1.1.1"
},
"devDependencies": {
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

## 2.8.9

### Patch Changes

- [#1905](https://github.com/navikt/aksel/pull/1905) [`212194964`](https://github.com/navikt/aksel/commit/212194964c4dd576e1ffc031316dff8cbe5016a2) Thanks [@KenAJoh](https://github.com/KenAJoh)! - :sparkles: Padding/border-radius tokens for button.css

## 2.8.8

## 2.8.7
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": "2.8.8",
"version": "2.8.9",
"description": "CSS for NAV Designsystem",
"author": "Aksel | NAV designsystem team",
"keywords": [
Expand All @@ -20,7 +20,7 @@
"watch": "postcss --watch --use postcss-import -o dist/index.css index.css"
},
"devDependencies": {
"@navikt/ds-tokens": "^2.8.8",
"@navikt/ds-tokens": "^2.8.9",
"normalize.css": "^8.0.1",
"postcss": "^8.4.0",
"postcss-cli": "^9.0.0",
Expand Down
8 changes: 8 additions & 0 deletions @navikt/core/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/ds-react

## 2.8.9

### Patch Changes

- Updated dependencies []:
- @navikt/aksel-icons@2.8.9
- @navikt/ds-icons@2.8.9

## 2.8.8

### 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": "2.8.8",
"version": "2.8.9",
"description": "Aksel react-components for NAV designsystem",
"author": "Aksel | NAV designsystem team",
"license": "MIT",
Expand Down Expand Up @@ -37,8 +37,8 @@
},
"dependencies": {
"@floating-ui/react": "0.17.0",
"@navikt/aksel-icons": "^2.8.8",
"@navikt/ds-icons": "^2.8.8",
"@navikt/aksel-icons": "^2.8.9",
"@navikt/ds-icons": "^2.8.9",
"@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

## 2.8.9

## 2.8.8

## 2.8.7
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": "2.8.8",
"version": "2.8.9",
"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": "^2.8.8",
"@navikt/ds-tokens": "^2.8.9",
"@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

## 2.8.9

## 2.8.8

## 2.8.7
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": "2.8.8",
"version": "2.8.9",
"description": "Design-tokens for NAV designsystem",
"author": "Aksel | NAV designsystem team",
"keywords": [
Expand Down
2 changes: 2 additions & 0 deletions @navikt/icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @navikt/ds-icons

## 2.8.9

## 2.8.8

## 2.8.7
Expand Down
2 changes: 1 addition & 1 deletion @navikt/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-icons",
"version": "2.8.8",
"version": "2.8.9",
"description": "Aksel icons for NAV",
"author": "Aksel | NAV designsystem team",
"repository": {
Expand Down
2 changes: 2 additions & 0 deletions @navikt/internal/css/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @navikt/ds-css-internal

## 2.8.9

## 2.8.8

## 2.8.7
Expand Down
2 changes: 1 addition & 1 deletion @navikt/internal/css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-css-internal",
"version": "2.8.8",
"version": "2.8.9",
"description": "CSS for NAV internal Designsystem-components",
"author": "Aksel | NAV designsystem team",
"keywords": [
Expand Down
8 changes: 8 additions & 0 deletions @navikt/internal/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/ds-react-internal

## 2.8.9

### Patch Changes

- Updated dependencies []:
- @navikt/ds-react@2.8.9
- @navikt/ds-icons@2.8.9

## 2.8.8

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions @navikt/internal/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-react-internal",
"version": "2.8.8",
"version": "2.8.9",
"description": "Aksel react components for internal UIs in NAV",
"author": "Aksel | NAV designsystem team",
"license": "MIT",
Expand Down Expand Up @@ -35,8 +35,8 @@
"watch": "tsc --watch -p tsconfig.esm.json"
},
"dependencies": {
"@navikt/ds-icons": "^2.8.8",
"@navikt/ds-react": "^2.8.8",
"@navikt/ds-icons": "^2.8.9",
"@navikt/ds-react": "^2.8.9",
"clsx": "^1.1.1",
"copy-to-clipboard": "^3.3.1"
},
Expand Down
18 changes: 9 additions & 9 deletions aksel.nav.no/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"website"
],
"dependencies": {
"@navikt/aksel-icons": "^2.8.8",
"@navikt/ds-codemod": "^2.8.8",
"@navikt/ds-css": "^2.8.8",
"@navikt/ds-css-internal": "^2.8.8",
"@navikt/ds-icons": "^2.8.8",
"@navikt/ds-react": "^2.8.8",
"@navikt/ds-react-internal": "^2.8.8",
"@navikt/ds-tailwind": "^2.8.8",
"@navikt/ds-tokens": "^2.8.8"
"@navikt/aksel-icons": "^2.8.9",
"@navikt/ds-codemod": "^2.8.9",
"@navikt/ds-css": "^2.8.9",
"@navikt/ds-css-internal": "^2.8.9",
"@navikt/ds-icons": "^2.8.9",
"@navikt/ds-react": "^2.8.9",
"@navikt/ds-react-internal": "^2.8.9",
"@navikt/ds-tailwind": "^2.8.9",
"@navikt/ds-tokens": "^2.8.9"
},
"devDependencies": {
"prettier-plugin-tailwindcss": "^0.2.3"
Expand Down
4 changes: 2 additions & 2 deletions examples/shadow-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"preview": "vite preview"
},
"dependencies": {
"@navikt/ds-css": "2.8.8",
"@navikt/ds-react": "2.8.8",
"@navikt/ds-css": "2.8.9",
"@navikt/ds-react": "2.8.9",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
Expand Down

0 comments on commit 7353e77

Please sign in to comment.