Skip to content

Commit

Permalink
🐛 Checkbox nested i CheckboxGroup mister nå ikke padding (#2612)
Browse files Browse the repository at this point in the history
* 🐛 Checkbox nested i CheckboxGroup mister nå ikke padding

* 🐛 Økt spesifisitet for checkbox i table
  • Loading branch information
KenAJoh authored Jan 12, 2024
1 parent b251e3f commit 2fedeab
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 18 deletions.
5 changes: 5 additions & 0 deletions .changeset/heavy-dolphins-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@navikt/ds-css": patch
---

Table: Checkbox nested i CheckboxGroup mister nå ikke padding
6 changes: 3 additions & 3 deletions @navikt/core/css/table.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@
padding: var(--a-spacing-1) var(--a-spacing-2);
}

.navds-table .navds-checkbox .navds-checkbox__input {
.navds-table :not(.navds-checkboxes) > .navds-checkbox .navds-checkbox__input {
top: -0.75rem;
}

.navds-table .navds-checkbox--small .navds-checkbox__input {
.navds-table :not(.navds-checkboxes) > .navds-checkbox--small .navds-checkbox__input {
top: -0.375rem;
}

.navds-table .navds-checkbox .navds-checkbox__label {
.navds-table :not(.navds-checkboxes) > .navds-checkbox .navds-checkbox__label {
padding: 0;
}

Expand Down
40 changes: 25 additions & 15 deletions @navikt/core/react/src/table/stories/table.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { Table } from "../";
import { Alert, Button, Checkbox, Link } from "../..";
import { Alert, Button, Checkbox, CheckboxGroup, Link } from "../..";

export default {
title: "ds-react/Table",
Expand Down Expand Up @@ -229,22 +229,32 @@ const SelectionTable = ({ size = "medium" }: { size?: "small" | "medium" }) => {
</Table.Row>
<Table.Row selected={selectedRows.includes("3")}>
<Table.DataCell>
<Checkbox
size={size}
hideLabel
checked={selectedRows.includes("3")}
onChange={() => toggleSelectedRow("3")}
aria-labelledby={`x_r3-${size}`}
>
{" "}
</Checkbox>
<CheckboxGroup legend="velg flere felt" hideLegend>
<Checkbox
size={size}
hideLabel
checked={selectedRows.includes("3")}
onChange={() => toggleSelectedRow("3")}
aria-labelledby={`x_r3-${size}`}
>
{" "}
</Checkbox>
<Checkbox
size={size}
hideLabel
checked={selectedRows.includes("3")}
onChange={() => toggleSelectedRow("3")}
aria-labelledby={`x_r3-${size}`}
>
{" "}
</Checkbox>
</CheckboxGroup>
</Table.DataCell>
<Table.HeaderCell scope="row">
<span id={`x_r3-${size}`}>Rudolph Bachenmeier</span>
<Table.HeaderCell scope="row" colSpan={4}>
<span id={`x_r3-${size}`}>
Don&apos;t stack multiple checkboxes
</span>
</Table.HeaderCell>
<Table.DataCell>32</Table.DataCell>
<Table.DataCell>Germany</Table.DataCell>
<Table.DataCell>70</Table.DataCell>
</Table.Row>
</Table.Body>
</Table>
Expand Down

0 comments on commit 2fedeab

Please sign in to comment.