Skip to content

Commit

Permalink
💄 Remove bottom margin on last item in Stepper and adjust FormProgres…
Browse files Browse the repository at this point in the history
…s accordingly (#2971)
  • Loading branch information
HalvorHaugan authored Jun 3, 2024
1 parent c171a73 commit 3346270
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 30 deletions.
5 changes: 5 additions & 0 deletions .changeset/witty-insects-hang.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@navikt/ds-css": patch
---

:lipstick: Remove bottom margin on last item in Stepper and adjust FormProgress accordingly
2 changes: 1 addition & 1 deletion @navikt/core/css/form/form-progress.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
.navds-form-progress__stepper {
border: 2px solid var(--a-border-subtle);
border-radius: var(--a-border-radius-large);
padding: var(--a-spacing-2) var(--a-spacing-4) 0;
padding: var(--a-spacing-2) var(--a-spacing-4);
margin-top: var(--a-spacing-1);
}
4 changes: 4 additions & 0 deletions @navikt/core/css/stepper.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@
margin: calc(var(--navds-stepper-border-width) * -1) calc(var(--navds-stepper-border-width) * -1) 1.75rem;
}

.navds-stepper__item:last-child .navds-stepper__step {
margin-bottom: 0;
}

@media (forced-colors: active) {
.navds-stepper__step {
background-color: ButtonFace;
Expand Down
46 changes: 17 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3241,18 +3241,6 @@ __metadata:
languageName: node
linkType: hard

"@floating-ui/react-dom@npm:^2.0.9":
version: 2.0.9
resolution: "@floating-ui/react-dom@npm:2.0.9"
dependencies:
"@floating-ui/dom": ^1.0.0
peerDependencies:
react: ">=16.8.0"
react-dom: ">=16.8.0"
checksum: f7a05c90955c713fc2851f74f87bdde9bd91df5f264f061f489bd3b6ce74c78dda204c3e71a09adc56b64f5324f2c2f23c01382e5ec897ee7e8e5235c41b45a9
languageName: node
linkType: hard

"@floating-ui/react@npm:0.25.4":
version: 0.25.4
resolution: "@floating-ui/react@npm:0.25.4"
Expand Down Expand Up @@ -3835,7 +3823,7 @@ __metadata:
languageName: node
linkType: hard

"@navikt/aksel-icons@^6.8.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
"@navikt/aksel-icons@^6.10.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
version: 0.0.0-use.local
resolution: "@navikt/aksel-icons@workspace:@navikt/aksel-icons"
dependencies:
Expand Down Expand Up @@ -3863,8 +3851,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/aksel-stylelint@workspace:@navikt/aksel-stylelint"
dependencies:
"@navikt/ds-css": ^6.8.0
"@navikt/ds-tokens": ^6.8.0
"@navikt/ds-css": ^6.10.0
"@navikt/ds-tokens": ^6.10.0
concurrently: 7.2.1
postcss-selector-parser: ^6.0.13
postcss-value-parser: ^4.2.0
Expand All @@ -3879,7 +3867,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/aksel@workspace:@navikt/aksel"
dependencies:
"@navikt/ds-css": 6.8.0
"@navikt/ds-css": 6.10.0
axios: 1.6.0
chalk: 4.1.0
clipboardy: ^2.3.0
Expand All @@ -3900,11 +3888,11 @@ __metadata:
languageName: unknown
linkType: soft

"@navikt/ds-css@*, @navikt/ds-css@6.8.0, @navikt/ds-css@^6.8.0, @navikt/ds-css@workspace:@navikt/core/css":
"@navikt/ds-css@*, @navikt/ds-css@6.10.0, @navikt/ds-css@^6.10.0, @navikt/ds-css@workspace:@navikt/core/css":
version: 0.0.0-use.local
resolution: "@navikt/ds-css@workspace:@navikt/core/css"
dependencies:
"@navikt/ds-tokens": ^6.8.0
"@navikt/ds-tokens": ^6.10.0
cssnano: 6.0.0
fast-glob: 3.2.11
lodash: 4.17.21
Expand All @@ -3917,14 +3905,14 @@ __metadata:
languageName: unknown
linkType: soft

"@navikt/ds-react@*, @navikt/ds-react@^6.8.0, @navikt/ds-react@workspace:@navikt/core/react":
"@navikt/ds-react@*, @navikt/ds-react@^6.10.0, @navikt/ds-react@workspace:@navikt/core/react":
version: 0.0.0-use.local
resolution: "@navikt/ds-react@workspace:@navikt/core/react"
dependencies:
"@floating-ui/react": 0.25.4
"@floating-ui/react-dom": ^2.0.9
"@navikt/aksel-icons": ^6.8.0
"@navikt/ds-tokens": ^6.8.0
"@navikt/aksel-icons": ^6.10.0
"@navikt/ds-tokens": ^6.10.0
"@testing-library/dom": 9.3.4
"@testing-library/jest-dom": ^5.16.0
"@testing-library/react": ^15.0.7
Expand Down Expand Up @@ -3954,11 +3942,11 @@ __metadata:
languageName: unknown
linkType: soft

"@navikt/ds-tailwind@^6.8.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
"@navikt/ds-tailwind@^6.10.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
version: 0.0.0-use.local
resolution: "@navikt/ds-tailwind@workspace:@navikt/core/tailwind"
dependencies:
"@navikt/ds-tokens": ^6.8.0
"@navikt/ds-tokens": ^6.10.0
color: 4.2.3
lodash: ^4.17.21
tailwindcss: ^3.3.3
Expand All @@ -3968,7 +3956,7 @@ __metadata:
languageName: unknown
linkType: soft

"@navikt/ds-tokens@^6.8.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
"@navikt/ds-tokens@^6.10.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
version: 0.0.0-use.local
resolution: "@navikt/ds-tokens@workspace:@navikt/core/tokens"
dependencies:
Expand Down Expand Up @@ -8524,11 +8512,11 @@ __metadata:
version: 0.0.0-use.local
resolution: "aksel.nav.no@workspace:aksel.nav.no"
dependencies:
"@navikt/aksel-icons": ^6.8.0
"@navikt/ds-css": ^6.8.0
"@navikt/ds-react": ^6.8.0
"@navikt/ds-tailwind": ^6.8.0
"@navikt/ds-tokens": ^6.8.0
"@navikt/aksel-icons": ^6.10.0
"@navikt/ds-css": ^6.10.0
"@navikt/ds-react": ^6.10.0
"@navikt/ds-tailwind": ^6.10.0
"@navikt/ds-tokens": ^6.10.0
languageName: unknown
linkType: soft

Expand Down

0 comments on commit 3346270

Please sign in to comment.