Skip to content

Commit

Permalink
Merge branch 'main' into label-description
Browse files Browse the repository at this point in the history
  • Loading branch information
KenAJoh authored May 10, 2023
2 parents 878ca03 + 2fe5a0a commit 769d300
Show file tree
Hide file tree
Showing 25 changed files with 71 additions and 36 deletions.
5 changes: 0 additions & 5 deletions .changeset/breezy-cows-draw.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

## 3.0.1

## 3.0.0

## 2.9.8
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": "3.0.0",
"version": "3.0.1",
"author": "Aksel | NAV",
"homepage": "https://aksel.nav.no/ikoner",
"repository": {
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

## 3.0.1

### Patch Changes

- Updated dependencies []:
- @navikt/ds-css@3.0.1

## 3.0.0

### 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": "3.0.0",
"version": "3.0.1",
"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": "3.0.0",
"@navikt/ds-css": "3.0.1",
"axios": "1.3.6",
"chalk": "4.1.0",
"clipboardy": "^2.3.0",
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

## 3.0.1

## 3.0.0

## 2.9.8
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": "3.0.0",
"version": "3.0.1",
"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 @@ -40,8 +40,8 @@
"build-pict": "svgr --silent --index-template index-template.js --out-dir src/pictograms pictograms"
},
"dependencies": {
"@navikt/ds-icons": "^3.0.0",
"@navikt/ds-react": "^3.0.0",
"@navikt/ds-icons": "^3.0.1",
"@navikt/ds-react": "^3.0.1",
"clsx": "^1.1.1"
},
"devDependencies": {
Expand Down
2 changes: 2 additions & 0 deletions @navikt/core/css/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @navikt/ds-css

## 3.0.1

## 3.0.0

### Major Changes
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": "3.0.0",
"version": "3.0.1",
"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": "^3.0.0",
"@navikt/ds-tokens": "^3.0.1",
"cssnano": "6.0.0",
"fast-glob": "3.2.11",
"lodash": "4.17.21",
Expand Down
11 changes: 11 additions & 0 deletions @navikt/core/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @navikt/ds-react

## 3.0.1

### Patch Changes

- [`fa2ead912`](https://github.com/navikt/aksel/commit/fa2ead912a4db15d1fa7e2c3efccbe69a64dc9a7) Thanks [@KenAJoh](https://github.com/KenAJoh)! - :fire: Fjernet ds-icons fra dependencies

- [`db3846f5c`](https://github.com/navikt/aksel/commit/db3846f5cd483ad0ca24bc5938cfcdb64260f89d) Thanks [@KenAJoh](https://github.com/KenAJoh)! - :bug: Fikset default headingSize for Accordion

- Updated dependencies []:
- @navikt/aksel-icons@3.0.1

## 3.0.0

### Major Changes
Expand Down
4 changes: 2 additions & 2 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": "3.0.0",
"version": "3.0.1",
"description": "Aksel react-components for NAV designsystem",
"author": "Aksel | NAV designsystem team",
"license": "MIT",
Expand Down Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"@floating-ui/react": "0.17.0",
"@navikt/aksel-icons": "^3.0.0",
"@navikt/aksel-icons": "^3.0.1",
"@radix-ui/react-tabs": "1.0.0",
"@radix-ui/react-toggle-group": "1.0.0",
"clsx": "^1.2.1",
Expand Down
4 changes: 2 additions & 2 deletions @navikt/core/react/src/accordion/Accordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export interface AccordionProps extends React.HTMLAttributes<HTMLDivElement> {
*/
variant?: "default" | "neutral";
/**
* @default 'large'
* @default 'small'
*/
headingSize?: "large" | "medium" | "small" | "xsmall";
/**
Expand All @@ -38,7 +38,7 @@ export const Accordion = forwardRef<HTMLDivElement, AccordionProps>(
{
className,
variant = "default",
headingSize = "medium",
headingSize = "small",
size = "medium",
...rest
},
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

## 3.0.1

## 3.0.0

## 2.9.8
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": "3.0.0",
"version": "3.0.1",
"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": "^3.0.0",
"@navikt/ds-tokens": "^3.0.1",
"@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

## 3.0.1

## 3.0.0

## 2.9.8
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": "3.0.0",
"version": "3.0.1",
"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

## 3.0.1

## 3.0.0

## 2.9.8
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": "3.0.0",
"version": "3.0.1",
"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

## 3.0.1

## 3.0.0

## 2.9.8
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": "3.0.0",
"version": "3.0.1",
"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

## 3.0.1

### Patch Changes

- Updated dependencies [[`fa2ead912`](https://github.com/navikt/aksel/commit/fa2ead912a4db15d1fa7e2c3efccbe69a64dc9a7), [`db3846f5c`](https://github.com/navikt/aksel/commit/db3846f5cd483ad0ca24bc5938cfcdb64260f89d)]:
- @navikt/ds-react@3.0.1
- @navikt/aksel-icons@3.0.1

## 3.0.0

### Major 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": "3.0.0",
"version": "3.0.1",
"description": "Aksel react components for internal UIs in NAV",
"author": "Aksel | NAV designsystem team",
"license": "MIT",
Expand Down Expand Up @@ -36,8 +36,8 @@
"watch": "tsc --watch -p tsconfig.esm.json"
},
"dependencies": {
"@navikt/aksel-icons": "^3.0.0",
"@navikt/ds-react": "^3.0.0",
"@navikt/aksel-icons": "^3.0.1",
"@navikt/ds-react": "^3.0.1",
"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": "^3.0.0",
"@navikt/ds-codemod": "^3.0.0",
"@navikt/ds-css": "^3.0.0",
"@navikt/ds-css-internal": "^3.0.0",
"@navikt/ds-icons": "^3.0.0",
"@navikt/ds-react": "^3.0.0",
"@navikt/ds-react-internal": "^3.0.0",
"@navikt/ds-tailwind": "^3.0.0",
"@navikt/ds-tokens": "^3.0.0"
"@navikt/aksel-icons": "^3.0.1",
"@navikt/ds-codemod": "^3.0.1",
"@navikt/ds-css": "^3.0.1",
"@navikt/ds-css-internal": "^3.0.1",
"@navikt/ds-icons": "^3.0.1",
"@navikt/ds-react": "^3.0.1",
"@navikt/ds-react-internal": "^3.0.1",
"@navikt/ds-tailwind": "^3.0.1",
"@navikt/ds-tokens": "^3.0.1"
},
"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": "3.0.0",
"@navikt/ds-react": "3.0.0",
"@navikt/ds-css": "3.0.1",
"@navikt/ds-react": "3.0.1",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
Expand Down

0 comments on commit 769d300

Please sign in to comment.