Skip to content

Commit

Permalink
Merge branch 'main' into skeleton-komponent
Browse files Browse the repository at this point in the history
  • Loading branch information
KenAJoh committed Jun 8, 2023
2 parents 16a10e5 + 35041e6 commit 3bac254
Show file tree
Hide file tree
Showing 935 changed files with 9,219 additions and 16,170 deletions.
3 changes: 0 additions & 3 deletions .changeset/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ Alle base-pakkene våre har `fixed versjonering`. Dette tilsier at en bump på e
"@navikt/ds-react",
"@navikt/ds-css",
"@navikt/aksel-icons",
"@navikt/ds-icons",
"@navikt/ds-tokens",
"@navikt/ds-tailwind",
"@navikt/ds-css-internal",
"@navikt/ds-react-internal",
"@navikt/ds-codemod"
```
10 changes: 10 additions & 0 deletions .changeset/breezy-queens-fetch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@navikt/aksel-stylelint": minor
"@navikt/ds-css": minor
"@navikt/ds-react": minor
---

:tada: Oppdatert Chips

- Toggle Chips har nå varianter: neutral og action
- Toggle Chips har nå en ny prop: `checkmark` som slår av/på checkmark ved selected-state
12 changes: 12 additions & 0 deletions .changeset/chilled-bottles-walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"@navikt/ds-tokens": minor
---

:tada: Fargetokens for datavisualisering.

6 varianter for surface,surface-subtle og border.

```css
background-color: var(--a-data-surface-1-subtle);
border-color: var(--a-data-1-border);
```
12 changes: 2 additions & 10 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,16 @@
"@navikt/ds-css",
"@navikt/ds-tokens",
"@navikt/ds-tailwind",
"@navikt/ds-css-internal",
"@navikt/ds-react-internal",
"@navikt/ds-codemod",
"@navikt/aksel-icons",
"@navikt/aksel",
"@navikt/ds-icons"
"@navikt/aksel-stylelint"
]
],
"linked": [],
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [
"shadow-dom",
"aksel.nav.no",
"@navikt/ds-navno",
"aksel-icons-figma-plugin"
],
"ignore": ["shadow-dom", "aksel.nav.no", "aksel-icons-figma-plugin"],

"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"updateInternalDependents": "always"
Expand Down
5 changes: 5 additions & 0 deletions .changeset/quick-numbers-remain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@navikt/ds-react": patch
---

Add JSDoc typings
6 changes: 6 additions & 0 deletions .changeset/small-clouds-wash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@navikt/ds-css": patch
"@navikt/ds-react": patch
---

:sparkles: La til `indent`-prop på Accordion
8 changes: 8 additions & 0 deletions .changeset/wild-chefs-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@navikt/ds-css": minor
"@navikt/ds-tokens": minor
---

- Oppdatert text-subtle og icon-subtle tokens til 700-skala (tidligere 600).
- Icon-subtle bruker nå grayalpha.
- Alle description-felter på fieldsets har nå text-subtle som farge.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
playwright:
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.30.0-focal
image: mcr.microsoft.com/playwright:v1.33.0-focal
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoketest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Smoketest Aksel
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.30.0-focal
image: mcr.microsoft.com/playwright:v1.33.0-focal
steps:
- uses: actions/setup-node@v3
with:
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/update-icons.yml

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/update-tokens.yml

This file was deleted.

12 changes: 2 additions & 10 deletions .storybook/intro.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,19 @@ import { Meta, Canvas } from "@storybook/addon-docs";

[Dokumentasjon](https://aksel.nav.no/komponenter)

### Core

```bash
yarn add @navikt/ds-react @navikt/ds-css
```

### Interne-flater

```bash
yarn add @navikt/ds-react-internal @navikt/ds-css-internal
```

### Ikoner
## Ikoner

[Dokumentasjon](https://aksel.nav.no/ikoner)

```bash
yarn add @navikt/aksel-icons
```

### Bruk
## Bruk

```jsx
import { Heading } from "@navikt/ds-react";
Expand Down
2 changes: 0 additions & 2 deletions .storybook/preview.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { RouterContext } from "next/dist/shared/lib/router-context";
import "@navikt/ds-css/index.css";
import "@navikt/ds-css-internal/index.css";
import "./layout.css";

export const parameters = {
Expand Down
8 changes: 8 additions & 0 deletions @navikt/aksel-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/aksel-icons

## 4.0.0

## 3.4.2

## 3.4.1

## 3.4.0

## 3.3.1

## 3.3.0
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.3.1",
"version": "4.0.0",
"author": "Aksel | NAV",
"homepage": "https://aksel.nav.no/ikoner",
"repository": {
Expand Down
1 change: 1 addition & 0 deletions @navikt/aksel-stylelint/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dist
21 changes: 21 additions & 0 deletions @navikt/aksel-stylelint/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# @navikt/aksel-stylelint

## 4.0.0

## 3.4.2

### Patch Changes

- [#2017](https://github.com/navikt/aksel/pull/2017) [`7615dbbb5`](https://github.com/navikt/aksel/commit/7615dbbb54c7c96e2252366188547b27b2ac1142) Thanks [@JulianNymark](https://github.com/JulianNymark)! - add missing dependency

## 3.4.1

### Patch Changes

- :bug: Stylelint hotfix, inkluderer nå dist-mappe (kanskje..)

## 3.4.0

### Minor Changes

- [#1973](https://github.com/navikt/aksel/pull/1973) [`61c411421`](https://github.com/navikt/aksel/commit/61c4114214841ec42f48e1abd0d72d2a42d265ab) Thanks [@JulianNymark](https://github.com/JulianNymark)! - add stylelint plugin
Loading

0 comments on commit 3bac254

Please sign in to comment.