Skip to content

Commit

Permalink
Merge branch 'main' into button_pr
Browse files Browse the repository at this point in the history
  • Loading branch information
aagonzales authored Jan 24, 2025
2 parents 1e40a82 + 88285c4 commit eb6b939
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 20 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"d3": "^7.9.0",
"gatsby": "^5.13.5",
"gatsby-plugin-sharp": "^5.13.1",
"gatsby-theme-carbon": "^4.2.3",
"gatsby-theme-carbon": "^4.2.4",
"markdown-it": "^14.1.0",
"prettier-config-carbon": "^0.11.0",
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/pages/all-about-carbon/the-carbon-ecosystem.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ _This content is accessible to IBMers only._
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Carbon for IBM Products"
href="https://pages.github.ibm.com/cdai-design/pal/"
href="https://pages.github.ibm.com/carbon/ibm-products/"
>

![Carbon for IBM products icon](images/ecosystem/carbon-for-ibm-product.svg)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 38 additions & 9 deletions src/pages/components/contained-list/style.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,19 @@ in a phrase and any proper nouns capitalized.

## Structure

| Element | Property | px / rem | Spacing token |
| --------------------------- | --------------------------- | -------- | ------------- |
| List header area: on-page | height | 32 / 2 | `$spacing-07` |
| | padding-left, padding-right | 16 / 1 | `$spacing-05` |
| List header area: disclosed | height | 48 / 3 | `$spacing-09` |
| | padding-left, padding-right | 16 / 1 | `$spacing-05` |
| List item | padding-left, padding-right | 16 / 1 | `$spacing-05` |
| Icon (optional) | height, width | 16 / 1 ||
| Element | Property | px / rem | Spacing token |
| ------------------------------------ | --------------------------- | -------- | ------------- |
| List header area: on-page | height | 32 / 2 | `$spacing-07` |
| | padding-left, padding-right | 16 / 1 | `$spacing-05` |
| List header area: disclosed | height | 48 / 3 | `$spacing-09` |
| | padding-left, padding-right | 16 / 1 | `$spacing-05` |
| List item | padding-left, padding-right | 16 / 1 | `$spacing-05` |
| Non-interactive icon (optional) | height, width | 16px ||
| | padding left, padding-right | 16 / 1 | `$spacing-05` |
| Inline action icon button (optional) | height, width | 16px ||
| | padding left, padding-right | 16 / 1 | `$spacing-05` |
| Search icon button (optional) | height, width | 16px ||
| | padding left, padding-right | 16 / 1 | `$spacing-05` |

<div className="image--fixed">

Expand Down Expand Up @@ -168,7 +173,31 @@ in a phrase and any proper nouns capitalized.
</div>

<Caption>
Structure and spacing measurements for inline actions. | px / rem
Structure and spacing measurements for inline actions | px / rem
</Caption>

<br />

<div className="image--fixed">

![Structure and spacing measurements for non-interactive icons.](images/contained-list-non-interactive-icons-style.png)

</div>

<Caption>
Structure and spacing measurements for non-interactive icons | px / rem
</Caption>

<br />

<div className="image--fixed">

![Structure and spacing measurements for search and filtering.](images/contained-list-search-style.png)

</div>

<Caption>
Structure and spacing measurements for search and filtering | px / rem
</Caption>

## Size
Expand Down
29 changes: 25 additions & 4 deletions src/pages/components/contained-list/usage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,15 @@ and optional interactive elements.
</Row>

1. **List header area:** Area to group the succeeding list items.
2. **List title:** Descriptive name for the group of list items.
3. **List item:** The content with in a list item row.
4. **Interactive element** (optional): An interactive element in the header or
row such as a button, link, icon, or toggle.
2. **List item area:** Area to group text and elements in a list row.
3. **List title:** Descriptive name for the group of list items.
4. **List item:** The content in a list item row.
5. **Non-interactive icon (optional):** A decorative icon to help visually
describe a list item.
6. **Search icon button (optional):** An icon button for search or filtering
functionality in the contained list.
7. **Interactive element (optional):** An interactive element in the header or
row such as a button, link, icon, tag, or toggle.

### Alignment

Expand Down Expand Up @@ -334,6 +339,22 @@ multiple column headers, we recommend using a data table instead.
</Column>
</Row>

### Non-interactive icons

Contained lists can have non-interactive icons positioned before the text in
each row to help visually describe the list item, category, or status. These
icons are decorative elements and are used for visual purposes only. Icons
should typically be the same color as the text in the row unless they are status
indicators.

<Row>
<Column colLg={8}>

![Contained list non-interactive icons](images/contained-list-non-interactive-icons-usage.png)

</Column>
</Row>

### Search and filtering

Contained lists can include a search or filter functionality. The search or
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6762,7 +6762,7 @@ __metadata:
gatsby-plugin-sharp: "npm:^5.13.1"
gatsby-plugin-sitemap: "npm:^6.13.1"
gatsby-source-filesystem: "npm:^5.13.1"
gatsby-theme-carbon: "npm:^4.2.3"
gatsby-theme-carbon: "npm:^4.2.4"
gatsby-transformer-sharp: "npm:^5.13.1"
html-loader: "npm:^5.1.0"
husky: "npm:^9.0.11"
Expand Down Expand Up @@ -11577,9 +11577,9 @@ __metadata:
languageName: node
linkType: hard

"gatsby-theme-carbon@npm:^4.2.3":
version: 4.2.3
resolution: "gatsby-theme-carbon@npm:4.2.3"
"gatsby-theme-carbon@npm:^4.2.4":
version: 4.2.4
resolution: "gatsby-theme-carbon@npm:4.2.4"
dependencies:
"@babel/core": "npm:^7.24.7"
"@babel/plugin-proposal-class-properties": "npm:^7.18.6"
Expand Down Expand Up @@ -11633,7 +11633,7 @@ __metadata:
gatsby: ^5.13.3
react: ^18.2.0
react-dom: ^18.2.0
checksum: 94bf36e294c1fc8f199453f942e1f58d88b623f35669cc258c5dde948d793c568c3e902da7420ddc544f79cd921937e61646fb5d69d5e5f8fd436db044c157c0
checksum: ac94b4777ef8e324b2425626bc800cba5214f631e294d2f2edb5231119b2e389cca91034c55f496b7c96075079ada71816792e2e649305c209507ad62eaa3933
languageName: node
linkType: hard

Expand Down

0 comments on commit eb6b939

Please sign in to comment.