Skip to content

Commit

Permalink
Merge branch 'main' into carbon-tutorial-web-components
Browse files Browse the repository at this point in the history
  • Loading branch information
lee-chase authored Nov 20, 2024
2 parents 094ec6f + 4aa7327 commit eaa559e
Show file tree
Hide file tree
Showing 88 changed files with 275 additions and 203 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ jobs:
APP_ID: ${{ secrets.APP_ID }}
APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
set-area-per-repo:
needs: setup-variables
runs-on: ubuntu-latest
if: ${{ github.event_name == 'issues' && github.event.action == 'opened' }}
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Get issue ID
id: get_issue_id
run: |
Expand Down
4 changes: 2 additions & 2 deletions src/pages/all-about-carbon/who-uses-carbon.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ Here are some ways marketers can begin engaging with Carbon:
drive IBM's portfolio of products and experiences.

- The majority of marketing experiences use Carbon web components. Visit
[Carbon for IBM.com](https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/)
to ensure that these experiences are adhering to Carbon guidance.
[Carbon for IBM.com](https://www.ibm.com/standards/carbon/) to ensure that
these experiences are adhering to Carbon guidance.

- Familiarize yourself with
[IBM.com web standards](https://www.ibm.com/standards/web/) to assess the
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/dropdown/images/dropdown-ai-presence-fluid.png
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/pages/components/dropdown/images/dropdown-style-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/dropdown/images/dropdown-style-1b.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/dropdown/images/dropdown-style-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/dropdown/images/dropdown-style-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/dropdown/images/dropdown-style-5b.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/dropdown/images/dropdown-style-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/dropdown/images/dropdown-style-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/dropdown/images/dropdown-style-8.png
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.
Binary file modified src/pages/components/dropdown/images/dropdown-usage-1-fluid.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-1.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-10a.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-10b.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-10c.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-10d.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-10e.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-10f.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-11a.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-11b.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-11c.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-12.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-16.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-17.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-2.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-3-fluid.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-3.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-4-do.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-4-dont.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-5.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-6.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-7a.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-8a-fluid.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-8a.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-8b.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-8c.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-8d.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-9a-fluid.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-9a.png
Binary file modified src/pages/components/dropdown/images/dropdown-usage-9b.png
42 changes: 32 additions & 10 deletions src/pages/components/dropdown/style.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ structure, and size and AI presence.
</Column>
</Row>

<Caption>
Dropdown variant examples: default, inline, multiselect, combo box.
</Caption>
<Caption>Color states of dropdown, combo box, and multiselect.</Caption>

### Interactive states

Expand Down Expand Up @@ -125,13 +123,37 @@ structure, and size and AI presence.

<Tab label="Default">

![Default dropdown and combo box states](images/dropdown-combobox-style-default-states.png)
![Default dropdown interactive states](images/dropdown-style-default-states.png)

</Tab>

<Tab label="Fluid">

![Fluid dropdown interactive states](images/dropdown-style-fluid-states.png)

</Tab>

</Tabs>

</Column>
</Row>

<Caption>Dropdown interactive states</Caption>

<Row>
<Column colLg={12}>

<Tabs>

<Tab label="Default">

![Default combo box interactive states](images/combobox-style-default-states.png)

</Tab>

<Tab label="Fluid">

![Fluid dropdown and combo box states](images/dropdown-combobox-style-fluid-states.png)
![Fluid combo box interactive states](images/combobox-style-fluid-states.png)

</Tab>

Expand All @@ -140,7 +162,7 @@ structure, and size and AI presence.
</Column>
</Row>

<Caption>Dropdown and combo box states</Caption>
<Caption>Combo box interactive states</Caption>

<Row>
<Column colLg={12}>
Expand All @@ -149,13 +171,13 @@ structure, and size and AI presence.

<Tab label="Default">

![Default multiselect dropdown states](images/dropdown-multiselect-style-default-states.png)
![Default multiselect interactive states](images/multiselect-style-default-states.png)

</Tab>

<Tab label="Fluid">

![Fluid multiselect dropdown states](images/dropdown-multiselect-style-fluid-states.png)
![Fluid multiselect interactive states](images/multiselect-style-fluid-states.png)

</Tab>

Expand All @@ -164,7 +186,7 @@ structure, and size and AI presence.
</Column>
</Row>

<Caption>Multiselect dropdown states</Caption>
<Caption>Multiselect interactive states</Caption>

### Inline dropdown

Expand Down Expand Up @@ -406,7 +428,7 @@ For more information on the AI style elements, see the

<Tab label="Fluid">

![Fluid dropdown AI example](images/dropdown-style-ai-presence-ai-revert-default.png)
![Fluid dropdown AI example](images/dropdown-style-ai-presence-ai-revert-fluid.png)

</Tab>

Expand Down
Loading

0 comments on commit eaa559e

Please sign in to comment.