diff --git a/package.json b/package.json
index f8305241d20..bc69065691b 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,9 @@
"@carbon/charts-react": "0.55.0",
"@carbon/elements": "^11.19.0",
"@carbon/icons-react": "^11.16.0",
- "@carbon/pictograms": "^12.12.0",
- "@carbon/pictograms-react": "^11.38.0",
- "@carbon/react": "^1.22.0",
+ "@carbon/pictograms": "^12.13.0",
+ "@carbon/pictograms-react": "^11.39.0",
+ "@carbon/react": "^1.23.0",
"@loadable/component": "^5.15.2",
"@slack/web-api": "^5.11.0",
"babel-preset-env": "^1.7.0",
diff --git a/src/data/docgen/react-docgen.json b/src/data/docgen/react-docgen.json
index 346309fd6eb..f6b81c364d8 100644
--- a/src/data/docgen/react-docgen.json
+++ b/src/data/docgen/react-docgen.json
@@ -8573,7 +8573,7 @@
}
}
},
- "unstable_TreeView": {
+ "TreeView": {
"description": "",
"displayName": "TreeView",
"props": {
@@ -8596,12 +8596,12 @@
"description": "Array representing all selected node IDs in the tree"
},
"size": {
- "defaultValue": { "value": "'default'", "computed": false },
+ "defaultValue": { "value": "'sm'", "computed": false },
"type": {
"name": "enum",
"value": [
- { "value": "'default'", "computed": false },
- { "value": "'compact'", "computed": false }
+ { "value": "'sm'", "computed": false },
+ { "value": "'xs'", "computed": false }
]
},
"required": false,
@@ -8642,7 +8642,7 @@
}
}
},
- "unstable_TreeNode": {
+ "TreeNode": {
"description": "",
"displayName": "TreeNode",
"props": {
diff --git a/src/data/nav-items.yaml b/src/data/nav-items.yaml
index 425d36119d3..84b80f77f33 100644
--- a/src/data/nav-items.yaml
+++ b/src/data/nav-items.yaml
@@ -198,6 +198,8 @@
path: /patterns/empty-states-pattern/
- title: Filtering
path: /patterns/filtering/
+ - title: Fluid styles
+ path: /patterns/fluid-styles/
- title: Forms
path: /patterns/forms-pattern/
- title: Global header
diff --git a/src/pages/all-about-carbon/releases.mdx b/src/pages/all-about-carbon/releases.mdx
index e801b5974fb..d3dae487e03 100755
--- a/src/pages/all-about-carbon/releases.mdx
+++ b/src/pages/all-about-carbon/releases.mdx
@@ -15,22 +15,22 @@ planned for Carbon’s future.
## Resources
-
-
-
-
-
-
-
-
-![ZenHub icon](images/z-icon.svg)
-
-
-
+
+
+
+
+
+
+
+
+
+
## Releases
diff --git a/src/pages/components/UI-shell-header/images/header-accessibility-1.png b/src/pages/components/UI-shell-header/images/header-accessibility-1.png
index 83a7345ba18..06f130bc743 100644
Binary files a/src/pages/components/UI-shell-header/images/header-accessibility-1.png and b/src/pages/components/UI-shell-header/images/header-accessibility-1.png differ
diff --git a/src/pages/components/UI-shell-header/images/header-accessibility-4.png b/src/pages/components/UI-shell-header/images/header-accessibility-4.png
index bd722b69bbb..37fb8805ba6 100644
Binary files a/src/pages/components/UI-shell-header/images/header-accessibility-4.png and b/src/pages/components/UI-shell-header/images/header-accessibility-4.png differ
diff --git a/src/pages/components/UI-shell-header/images/header-accessibility-5.png b/src/pages/components/UI-shell-header/images/header-accessibility-5.png
index e8f5dcfd4c5..9659b47e1c2 100644
Binary files a/src/pages/components/UI-shell-header/images/header-accessibility-5.png and b/src/pages/components/UI-shell-header/images/header-accessibility-5.png differ
diff --git a/src/pages/components/button/usage.mdx b/src/pages/components/button/usage.mdx
index d989c17a760..3b3300573f6 100755
--- a/src/pages/components/button/usage.mdx
+++ b/src/pages/components/button/usage.mdx
@@ -323,20 +323,20 @@ button locations include:
| _Right-justified_ | Inline notifications, inline field buttons and data tables, progressive forms, wizards, and single-button dialogs |
| _Full-span_ | Dialogs, side panels, and small tiles; currently Carbon does not offer a way to implement full-span buttons in code, without an override, they max out at 320px |
-#### Fluid versus fixed buttons
+#### Fluid versus default buttons
Button alignment is also closely related to whether the button is treated as a
-fixed or a fluid element within a layout. When we say “fluid”, we mean that the
-button becomes a part of a larger, compound component by bleeding to two or more
-edges of its container. Rather than defining the a fluid button’s width in
+default or a fluid element within a layout. When we say “fluid”, we mean that
+the button becomes a part of a larger, compound component by bleeding to two or
+more edges of its container. Rather than defining the a fluid button’s width in
columns or mini units, its width is defined as a percentage (often 50%) of the
-container’s width. Also, as a general rule, fluid buttons are never left-aligned
-in a layout or a container—they’re always either right-aligned, or span the full
-width of the container.
+container’s width. Also, as a general rule, fluid primary buttons are never
+left-aligned in a layout or a container—they’re always either right-aligned, or
+span the full width of the container.
Fluid components like button never exist in isolation. As you can see in the
examples above, they are always part of another component, like modal or form.
-Other fluid components include tiles and most recently,
+Other fluid components include tiles and most recently, form inputs such as
[text inputs](/components/text-input/usage).
@@ -384,15 +384,20 @@ recommended feature to improve accessibility.
-#### Using the grid
+#### Fluid-width default buttons
-By default the container’s width is set to the size of the text label with 64px
-fixed padding on the right side and 16px fixed padding on the left. However,
-when possible set the button container’s relative position to the responsive
-layout grid and match button width to the other elements on the page. Ideally,
-when using groups of related buttons (not including ghost buttons), they should
-all be the same width. See [button groups](#Button-groups) below for more
-detailed information.
+The default button’s width is set to the size of the text label with 64px fixed
+padding on the right side and 16px fixed padding on the left. However, there is
+a hybrid scenario where a floating default-style button can span a designated
+number of columns on the responsive column grid, giving it a fluid width. These
+are called "fluid-width default buttons."
+
+Fluid-width default buttons are always preferable to fixed-width default buttons
+in a layout. When possible set the default button container’s relative position
+to the responsive layout grid and match button width to the width of other
+elements on the page. Ideally, when using groups of related buttons (not
+including ghost buttons), they should all be the same width. See button groups
+below for more detailed information.
@@ -523,15 +528,15 @@ button groups are also common in products, to save real estate in narrow columns
and occasionally side panels. In these instances, the primary button is always
on top and the secondary or tertiary button is below.
-Generally, when designers stack buttons, they tend to use the fixed buttons.
-However, stacked fluid buttons are also an option in desktop side panels with
-especially long calls to action. _Note: experimenting with stacked fluid buttons
-would require an override to the existing code._
+Generally, when designers stack buttons, they tend to use the hybrid fluid
+buttons. However, stacked fluid buttons are also an option in desktop side
+panels with especially long calls to action. Note: experimenting with stacked
+fluid buttons would require an override to the existing code.
-![Fluid and fixed stacked button group examples](images/button_usage_24.png)
+![Fluid and default stacked button group examples](images/button_usage_24.png)
diff --git a/src/pages/components/content-switcher/accessibility.mdx b/src/pages/components/content-switcher/accessibility.mdx
index ff81a42d32e..2f30ef81be4 100644
--- a/src/pages/components/content-switcher/accessibility.mdx
+++ b/src/pages/components/content-switcher/accessibility.mdx
@@ -2,90 +2,111 @@
title: Content switcher
description:
Content switchers manipulate the content shown following an exclusive or
- “either/or” pattern. It is used to toggle between two or more content sections
+ "either/or" pattern. It is used to toggle between two or more content sections
within the same space on screen.
tabs: ['Usage', 'Style', 'Code', 'Accessibility']
---
-The content switcher React Carbon component has been tested against the latest
-[W3C Web Content Accessibility Guidelines (WCAG) 2.1 Level A and AA success criteria](https://www.w3.org/TR/WCAG21/)
-and violations have been identified as high priority issues. This document will
-be updated when these accessibility issues are resolved.
+Design annotations are needed for specific instances shown below, but for the
+standard content switcher component, Carbon already incorporates accessibility.
- Accessibility considerations
- Resources
- Accessibility testing
+ What Carbon provides
+ Design recommendations
+ Development considerations
-## Accessibility considerations
+## What Carbon provides
-1. Each content switcher tab must have a unique title that clearly describes the
- content panel. This is particularly helpful for users of assistive
- technologies so they have the necessary information to efficiently navigate
- the content.
-2. Carbon components should be used to create the content that displays within
- each content panel.
-3. Content authors need to ensure the content that is added to the tab panel is
- accessible. For example, if you add an image to the panel you need to include
- alternative text to pass accessibility testing.
+Carbon bakes keyboard operation into its components, improving the experience of
+blind users and others who operate via the keyboard. Carbon incorporates many
+other accessibility considerations, some of which are described below.
-## Resources
+### Keyboard interactions
-- [W3C WAI-ARIA Tab Design Pattern](https://www.w3.org/TR/wai-aria-practices-1.1/#tabpanel)
- covers the usage of ARIA names, state and roles, as well as the expected
- keyboard interactions.
-- [IBM Accessibility Requirements](https://www.ibm.com/able/requirements/requirements/):
+Like tabs, content switchers can be automatic or manual. In both instances, the
+content switcher takes one tab stop, and arrow keys are used to navigate between
+content tabs.
- - [1.3.1 Info and Relationships](https://www.ibm.com/able/requirements/requirements/#1_3_1)
- (WCAG Success Criteria
- [1.3.1](https://www.w3.org/WAI/WCAG21/Understanding/info-and-relationships))
- - [1.3.2 Meaningful Sequence](https://www.ibm.com/able/requirements/requirements/#1_3_2)
- (WCAG Success Criteria
- [1.3.2](https://www.w3.org/WAI/WCAG21/Understanding/meaningful-sequence))
+
+
+
+![A user tabs to the content switcher then changes the selection with left and right arrow keys. Pressing tab again moves focus to a link inside the section's content.](images/content-switcher-accessibility-1.png)
+
+
+ Manual and automatic content switchers have the same basic keyboard
+ interaction.
+
+
+
+
+
+Automatic and manual switchers differ in how they are activated. The following
+illustration shows what will happen for each variant when a right arrow key is
+pressed with the All content tab selected and focused.
+
+For automatic switchers, focus and selection are synchronized. When the user
+arrows to a tab, it is selected and the content section under the switcher is
+updated in real time.
+
+Manual switchers allow the user to arrow between the content tabs without
+updating the content section underneath. When the user right arrows, the All
+content tab remains selected while focus moves to the Read tab. In order to
+select the Read tab (and update the content section under the switcher) the user
+would press `Enter` or `Space`.
+
+
+
-## Accessibility testing
+![Two variants of a content switcher with tabs called All, Read and Unread. In the first, the Read tab is selected and focused. In the second the All tab is selected and the Read tab has a focus indicator](images/content-switcher-accessibility-2.png)
-Automated, manual and screen reader accessibility verification test has been
-performed on the Content Switcher React Carbon Component.
-[WCAG 2.1 Level A and AA success criteria](https://www.w3.org/TR/WCAG21/) issues
-have been identified and the list of open accessibility violations is available
-in the Carbon Component GitHub repository.
+
+ Arrows keys alone update the selected tab in an automatic content switcher.
+ The Space and Enter keys are used to select a content tab after arrowing to it
+ in a manual variant.
+
-### Automated test
+
+
+
+## Design recommendations
+
+### Indicate which variant to implement
+
+The automatic and manual switchers are visually indistinguishable in a
+wireframe, so designers should annotate which variant the team has decided to
+implement. Since the choice largely concerns technical considerations about
+potential latency when updating the content section’s information, architects or
+developers should be involved in the discussion.
-
-
-
-
-
- Automated test environment
-
- Results
-
-
-
-
-
- - macOS Mojave version 10.14.2 with VoiceOver
-
- - Chrome version 77.0.3865.90
-
- - Dynamic Assessment Plugin (DAP) version 1.8.0.0 - IBM
- Accessibility WCAG 2.1 Sept. 2019 Ruleset
- - Carbon React version 7.7.1
-
-
- DAP test:
- - Violations
-
-
-
-
-
+
+
+![Two content switchers, one with a pink annotation reading "auto", the other with an annotation "manual"](images/content-switcher-accessibility-3.png)
+
+
+ Annotate whether the switcher should be implemented as automatic or manual.
+
+
+
+
+## Development considerations
+
+Keep these considerations in mind if you are modifying Carbon or creating a
+custom component.
+
+- The Content switcher is implemented as a `tablist`, with each content tab
+ implemented as a `
+### States
+
+#### Invalid
+
+Real time validation helps to streamline the process of filling out a form. We
+have three indicators of an invalid state: a border, an icon indicator, and an
+error message. Having text, color, and weight differentiation as invalid
+indicators help meet accessibility requirements. For full guidelines, refer to
+the [form component](https://www.carbondesignsystem.com/components/form/usage)
+usage page.
+
+
+
+
+![Dropdown invalid state.](images/dropdown-usage-14.gif)
+
+
+
+
+#### Disabled
+
+A dropdown cannot be clicked, selected, or interacted with if it is disabled. It
+is not read by a screen reader and takes on the default disabled visual style.
+Tooltips on a disabled state are also not read by screen readers and we
+recommend having an alternative way to show descriptive text if needed.
+
+
+
+
+![Dropdown disabled state.](images/dropdown-usage-15.png)
+
+
+
+
### Interactions
#### Mouse
@@ -391,7 +493,21 @@ or clicking outside of the menu.
-![Dropdown closed and open state click targets.](images/dropdown-usage-8a.png)
+
+
+
+
+![Default dropdown closed and open state click targets.](images/dropdown-usage-8a.png)
+
+
+
+
+
+![Fluid dropdown closed and open state click targets.](images/dropdown-usage-8a-fluid.png)
+
+
+
+
@@ -401,7 +517,21 @@ or clicking outside of the menu.
-![Dropdown menu option click target.](images/dropdown-usage-8b.png)
+
+
+
+
+![Default dropdown menu option click target.](images/dropdown-usage-8b.png)
+
+
+
+
+
+![Fluid dropdown menu option click target.](images/dropdown-usage-8b-fluid.png)
+
+
+
+
@@ -458,18 +588,6 @@ or clicking outside of the menu.
select or deselect the option.
- Users can open and close a dropdown menu by pressing `Space`.
-#### Screen readers
-
-- Labels must be announced to the screen reader on focus. Ensure the helper text
- that appears under an input is read when an assistive technology user stops at
- an input using ARIA.
-- VoiceOver: Users can trigger a state change by pressing `Control-Option-Space`
- or `Space` while the dropdown field has screen reader focus.
-- JAWS: Users can trigger a state change by pressing `Space` while the dropdown
- field has screen reader focus.
-- NVDA: Users can trigger a state change by pressing `Space` while the dropdown
- field has screen reader focus.
-
## Dropdown
Use when you can select only one option from a list at a time.
@@ -480,7 +598,21 @@ Use when you can select only one option from a list at a time.
-![Dropdown closed and open state.](images/dropdown-usage-9a.png)
+
+
+
+
+![Default dropdown closed and open state.](images/dropdown-usage-9a.png)
+
+
+
+
+
+![Fluid dropdown closed and open state.](images/dropdown-usage-9a-fluid.png)
+
+
+
+
@@ -512,7 +644,21 @@ Use when you can select multiple options from a list or to filter information.
-![Multiselect dropdown closed and open states.](images/dropdown-usage-10a.png)
+
+
+
+
+![Default multiselect dropdown closed and open states.](images/dropdown-usage-10a.png)
+
+
+
+
+
+![Fluid multiselect dropdown closed and open states.](images/dropdown-usage-10a-fluid.png)
+
+
+
+
@@ -528,7 +674,21 @@ Use when you can select multiple options from a list or to filter information.
-![Multiselect dropdown selected state.](images/dropdown-usage-10b.png)
+
+
+
+
+![Default multiselect dropdown selected state.](images/dropdown-usage-10b.png)
+
+
+
+
+
+![Fluid multiselect dropdown selected state.](images/dropdown-usage-10b-fluid.png)
+
+
+
+
@@ -561,7 +721,21 @@ to select.
-![Filterable dropdown closed and open state.](images/dropdown-usage-10d.png)
+
+
+
+
+![Default filterable dropdown closed and open state.](images/dropdown-usage-10d.png)
+
+
+
+
+
+![Fluid filterable dropdown closed and open state.](images/dropdown-usage-10d-fluid.png)
+
+
+
+
@@ -590,7 +764,21 @@ to select.
-![Filterable dropdown selected state.](images/dropdown-usage-10f.png)
+
+
+
+
+![Default filterable dropdown selected state.](images/dropdown-usage-10f.png)
+
+
+
+
+
+![Fluid filterable dropdown selected state.](images/dropdown-usage-10f-fluid.png)
+
+
+
+
@@ -631,7 +819,21 @@ typically used when there are a large amount of options to choose from.
-![Combo box selected state.](images/dropdown-usage-11c.png)
+
+
+
+
+![Default combo box selected state.](images/dropdown-usage-11c.png)
+
+
+
+
+
+![Fluid combo box selected state.](images/dropdown-usage-11c-fluid.png)
+
+
+
+
@@ -654,55 +856,13 @@ modifier for dropdown and does not have filtering functionality._
-#### Light
-
-Use the `light` prop modifier when using a dropdown on a background other than
-the UI background for that theme. The light prop changes the background color
-token of the dropdown from `field-01` to `field-02`. This is frequently used in
-form modals and side panels, or when a dropdown sits on top of a tile on a page.
-
-
-
-
-![Light prop applied to dropdowns in a filter panel.](images/dropdown-usage-13.png)
-
-
-
-
-#### Invalid
-
-Real time validation helps to streamline the process of filling out a form. We
-have three indicators of an invalid state: a border, an icon indicator, and an
-error message. Having text, color, and weight differentiation as invalid
-indicators help meet accessibility requirements. For full guidelines, refer to
-the [form component](https://www.carbondesignsystem.com/components/form/usage)
-usage page.
-
-
-
-
-![Dropdown invalid state.](images/dropdown-usage-14.gif)
-
-
-
-
-#### Disabled
-
-A dropdown cannot be clicked, selected, or interacted with if it is disabled. It
-is not read by a screen reader and takes on the default disabled visual style.
-Tooltips on a disabled state are also not read by screen readers and we
-recommend having an alternative way to show descriptive text if needed.
-
-
-
-
-![Dropdown disabled state.](images/dropdown-usage-15.png)
-
-
-
-
## Related
+- [Checkbox](https://www.carbondesignsystem.com/components/checkbox/code)
+- [Form](https://www.carbondesignsystem.com/components/form/code)
+- [Radio button](https://www.carbondesignsystem.com/components/radio-button/code)
+- [Select](https://www.carbondesignsystem.com/components/select/code)
+
#### Dropdown versus Select
Dropdown and select components have functionality and style differences.
@@ -736,11 +896,6 @@ Angie Li,
[Dropdown: Design Guidelines](https://www.nngroup.com/articles/drop-down-menus/)
(Nielsen Norman Group, 2017)
-- [Checkbox](https://www.carbondesignsystem.com/components/checkbox/code)
-- [Form](https://www.carbondesignsystem.com/components/form/code)
-- [Radio button](https://www.carbondesignsystem.com/components/radio-button/code)
-- [Select](https://www.carbondesignsystem.com/components/select/code)
-
## Feedback
Help us improve this pattern by providing feedback, asking questions, and
diff --git a/src/pages/components/form/images/form-style-1.png b/src/pages/components/form/images/form-style-1.png
index 6bd196f045a..4e5eadbbee7 100644
Binary files a/src/pages/components/form/images/form-style-1.png and b/src/pages/components/form/images/form-style-1.png differ
diff --git a/src/pages/components/form/images/form-style-4.png b/src/pages/components/form/images/form-style-4.png
new file mode 100644
index 00000000000..081ac4d5bf7
Binary files /dev/null and b/src/pages/components/form/images/form-style-4.png differ
diff --git a/src/pages/components/form/images/form-usage-1-fluid.png b/src/pages/components/form/images/form-usage-1-fluid.png
new file mode 100644
index 00000000000..4c1cdb27432
Binary files /dev/null and b/src/pages/components/form/images/form-usage-1-fluid.png differ
diff --git a/src/pages/components/form/images/form-usage-1.png b/src/pages/components/form/images/form-usage-1.png
index bf484363fe3..e3a92071404 100644
Binary files a/src/pages/components/form/images/form-usage-1.png and b/src/pages/components/form/images/form-usage-1.png differ
diff --git a/src/pages/components/form/images/form-usage-2.png b/src/pages/components/form/images/form-usage-2.png
new file mode 100644
index 00000000000..c1bcd1d7caa
Binary files /dev/null and b/src/pages/components/form/images/form-usage-2.png differ
diff --git a/src/pages/components/form/images/form-usage-3-do.png b/src/pages/components/form/images/form-usage-3-do.png
new file mode 100644
index 00000000000..9d776c2f655
Binary files /dev/null and b/src/pages/components/form/images/form-usage-3-do.png differ
diff --git a/src/pages/components/form/images/form-usage-3-dont.png b/src/pages/components/form/images/form-usage-3-dont.png
new file mode 100644
index 00000000000..114cea29313
Binary files /dev/null and b/src/pages/components/form/images/form-usage-3-dont.png differ
diff --git a/src/pages/components/form/images/form-usage-4-do.png b/src/pages/components/form/images/form-usage-4-do.png
new file mode 100644
index 00000000000..0f156f6e7c6
Binary files /dev/null and b/src/pages/components/form/images/form-usage-4-do.png differ
diff --git a/src/pages/components/form/images/form-usage-4-dont.png b/src/pages/components/form/images/form-usage-4-dont.png
new file mode 100644
index 00000000000..cbd8fb46b7c
Binary files /dev/null and b/src/pages/components/form/images/form-usage-4-dont.png differ
diff --git a/src/pages/components/form/images/form-usage-4.png b/src/pages/components/form/images/form-usage-4.png
deleted file mode 100644
index 35405266c23..00000000000
Binary files a/src/pages/components/form/images/form-usage-4.png and /dev/null differ
diff --git a/src/pages/components/form/images/form-usage-5.png b/src/pages/components/form/images/form-usage-5.png
index ed1dc2fb032..696f170bc47 100644
Binary files a/src/pages/components/form/images/form-usage-5.png and b/src/pages/components/form/images/form-usage-5.png differ
diff --git a/src/pages/components/form/images/form-usage-5b.png b/src/pages/components/form/images/form-usage-5b.png
new file mode 100644
index 00000000000..8a0a4ab022a
Binary files /dev/null and b/src/pages/components/form/images/form-usage-5b.png differ
diff --git a/src/pages/components/form/images/form-usage-6.png b/src/pages/components/form/images/form-usage-6.png
index a6f8f68b837..7d0779c8db1 100644
Binary files a/src/pages/components/form/images/form-usage-6.png and b/src/pages/components/form/images/form-usage-6.png differ
diff --git a/src/pages/components/form/images/form-usage-7.png b/src/pages/components/form/images/form-usage-7.png
index 2311f7dca63..ef08bc75e88 100644
Binary files a/src/pages/components/form/images/form-usage-7.png and b/src/pages/components/form/images/form-usage-7.png differ
diff --git a/src/pages/components/form/images/form-usage-8.png b/src/pages/components/form/images/form-usage-8.png
index f46acde7cd5..d8efaa49a59 100644
Binary files a/src/pages/components/form/images/form-usage-8.png and b/src/pages/components/form/images/form-usage-8.png differ
diff --git a/src/pages/components/form/images/form-usage-optional.png b/src/pages/components/form/images/form-usage-optional.png
index 873962be428..76253041806 100644
Binary files a/src/pages/components/form/images/form-usage-optional.png and b/src/pages/components/form/images/form-usage-optional.png differ
diff --git a/src/pages/components/form/images/form-usage-required.png b/src/pages/components/form/images/form-usage-required.png
index b1c482ea554..64aac910e0d 100644
Binary files a/src/pages/components/form/images/form-usage-required.png and b/src/pages/components/form/images/form-usage-required.png differ
diff --git a/src/pages/components/form/images/form-usage-states-fixed.png b/src/pages/components/form/images/form-usage-states-fixed.png
new file mode 100644
index 00000000000..18834314a8b
Binary files /dev/null and b/src/pages/components/form/images/form-usage-states-fixed.png differ
diff --git a/src/pages/components/form/images/form-usage-states-fluid.png b/src/pages/components/form/images/form-usage-states-fluid.png
new file mode 100644
index 00000000000..5ea20720f3a
Binary files /dev/null and b/src/pages/components/form/images/form-usage-states-fluid.png differ
diff --git a/src/pages/components/form/style.mdx b/src/pages/components/form/style.mdx
index 3b51c71b68f..13265b567e2 100644
--- a/src/pages/components/form/style.mdx
+++ b/src/pages/components/form/style.mdx
@@ -20,11 +20,6 @@ for specific typography details on each component.
-
- Example of light fields with $field-02 (left) and the default version with
- $field-01 (right)
-
-
## Typography
Form headings and labels should be set in sentence case with the first letter of
@@ -47,20 +42,20 @@ for specific typography details on each component.
Forms are made up of several different components. The order in which these
elements are arranged is flexible and by default the vertical spacing between
-elements should follow the guidelines below. The vertical spacing in a form can
+elements follow the guidelines below. The vertical spacing in a default form can
be adjusted to be smaller than the default depending on the use case or layout.
Forms can be one column or two. The width of each column varies based on the
content and layout of the design. On mobile, forms can only have one column.
-### Recommended
+### Recommended for default forms
| Element | Property | px / rem | Spacing token |
| -------------------- | ------------- | -------- | ------------- |
| Form items | margin-bottom | 32 / 2 | `$spacing-07` |
-| Title area | margin-bottom | 32 / 2 | `$spacing-07` |
+| Title area | margin-bottom | 40 / 2.5 | `$spacing-08` |
| Gutter between items | – | 32 / 2 | `$spacing-07` |
-| Buttons | margin-top | 32 / 2 | `$spacing-07` |
+| Buttons | margin-top | 48 / 3 | `$spacing-09` |
@@ -72,9 +67,18 @@ content and layout of the design. On mobile, forms can only have one column.
Structure and spacing measurements for a double column form | px / rem
+### Recommended for fluid forms
+
+| Element | Property | px / rem | Spacing token |
+| -------------------- | ------------- | -------- | ------------- |
+| Form items | margin-bottom | 0 px | – |
+| Title area | margin-bottom | 40 / 2.5 | `$spacing-08` |
+| Gutter between items | – | 1 px | – |
+| Buttons | margin-top | 48 / 3 | `$spacing-09` |
+
-![Structure and spacing measurements for a single column form](images/form-style-2.png)
+![Structure and spacing measurements for a single column form](images/form-style-4.png)
diff --git a/src/pages/components/form/usage.mdx b/src/pages/components/form/usage.mdx
index 07b5ea09a6e..b943e3587ba 100755
--- a/src/pages/components/form/usage.mdx
+++ b/src/pages/components/form/usage.mdx
@@ -18,23 +18,21 @@ configure options.
OverviewLive demoFormatting
-Form logic
-Validation and errors
+Content
+Behaviors
+Additional guidance
+RelatedFeedback
## Overview
-Forms are used for submitting data so be as concise as possible when designing.
-Keep it short. Think about each field and what value the data will provide. What
-do you gain by collecting this information?
-
-#### Begin by asking:
-
-- Is this a piece of information that is valuable to us?
-- Is this a piece of information that is so valuable that it's worth preventing
- the user from continuing if they choose not to provide it?
+The form component is configurable to fit various use cases and layouts. It is
+purposely simple out of the box, and users are responsible for configuring it to
+suit their needs. For in-depth design guidance on the different ways to
+configure and extend a form, see the
+[form pattern](/patterns/forms-pattern/#spacing).
## Live demo
@@ -72,7 +70,7 @@ do you gain by collecting this information?
id="test2"
invalidText="Invalid error message."
labelText="Text input label"
- placeholder="Placeholder text"
+ placeholder="Optional placeholder text"
/>
- Structure and spacing measurements for a number input | px / rem
+ Structure and spacing measurements for a default number input | px / rem
+
+
+![Structure and spacing for number input](images/number-input-style-1-fluid.png)
+
+
+
+
+ Structure and spacing measurements for a fluid number input | px / rem
## Sizes
+### Default input heights
+
The height varies for each size variant and the width varies based on content,
layout, and design.
diff --git a/src/pages/components/number-input/usage.mdx b/src/pages/components/number-input/usage.mdx
index 43a73b723d5..fd3b849df24 100755
--- a/src/pages/components/number-input/usage.mdx
+++ b/src/pages/components/number-input/usage.mdx
@@ -136,7 +136,21 @@ values.
-![number input anatomy](images/number-input-usage-2.png)
+
+
+
+
+![Anatomy of a default number input](images/number-input-usage-2.png)
+
+
+
+
+
+![Anatomy of a fluid number input](images/number-input-usage-2-fluid.png)
+
+
+
+
@@ -155,10 +169,34 @@ values.
8. **Error or Warning text**: It replaces the helper text when an error or
warning state appears.
+### Styling
+
+There are two styles of number inputs, default and fluid. They share the same
+functionality but look visually different, influencing where to use them.
+
+| Style | Appearance | Use case |
+| ------- | ------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Default | A traditional style where the label is positioned outside and above the input field. | Use when white space is needed between input components or in productive moments where space is at a premium, and smaller components are needed. |
+| Fluid | An alternative style where the label is placed inside of the input field and is stacked inline with the user input text. | Use in expressive moments, fluid forms, contained spaces, or attached to complex components, like a toolbar. |
+
+
+
+
+![An example of a default and fluid number input](images/number-input-usage-11.png)
+
+
+
+
+
+ A default style input is shown on the left and fluid style is on the right.
+
+
### Sizing
-Number input has three sizes in height: **small**, **medium**, and **large**.
-The width varies in size based on content, layout, and design.
+#### Default input heights
+
+Number input has three sizes default input heights: **small**, **medium**, and
+**large**. The width varies in size based on content, layout, and design.
| Size | Height (px/rem) | Use case |
| ----------- | --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -169,7 +207,21 @@ The width varies in size based on content, layout, and design.
-![number input sizes](images/number-input-usage-3.png)
+![Default number input sizes](images/number-input-usage-3.png)
+
+
+
+
+#### Fluid input heights
+
+There is only one fluid input height and it is visually larger than the default
+heights. The input is a set height of 64px except when a warning or error
+message has been added to the bottom.
+
+
+
+
+![Fluid input size example](images/number-input-usage-3-fluid.png)
@@ -228,7 +280,21 @@ The number input has a series of states for both field and controls elements:
-![number input interactive states](images/number-input-usage-6.png)
+
+
+
+
+![Default number input interactive states](images/number-input-usage-6.png)
+
+
+
+
+
+![Fluid number input interactive states](images/number-input-usage-6-fluid.png)
+
+
+
+
@@ -244,7 +310,21 @@ add or subtract icon controls.
-![number input mouse and keyboard interactions](images/number-input-usage-7.png)
+
+
+
+
+![Default number input mouse and keyboard interactions](images/number-input-usage-7.png)
+
+
+
+
+
+![Fluid number input mouse and keyboard interactions](images/number-input-usage-7-fluid.png)
+
+
+
+
diff --git a/src/pages/components/search/images/search-anatomy-fixed.png b/src/pages/components/search/images/search-anatomy-fixed.png
new file mode 100644
index 00000000000..7cebfe3be61
Binary files /dev/null and b/src/pages/components/search/images/search-anatomy-fixed.png differ
diff --git a/src/pages/components/search/images/search-anatomy-fluid.png b/src/pages/components/search/images/search-anatomy-fluid.png
new file mode 100644
index 00000000000..ed09280271f
Binary files /dev/null and b/src/pages/components/search/images/search-anatomy-fluid.png differ
diff --git a/src/pages/components/search/images/search-click-area-fixed.png b/src/pages/components/search/images/search-click-area-fixed.png
new file mode 100644
index 00000000000..09346e73ac9
Binary files /dev/null and b/src/pages/components/search/images/search-click-area-fixed.png differ
diff --git a/src/pages/components/search/images/search-click-area-fluid.png b/src/pages/components/search/images/search-click-area-fluid.png
new file mode 100644
index 00000000000..744ff7f0122
Binary files /dev/null and b/src/pages/components/search/images/search-click-area-fluid.png differ
diff --git a/src/pages/components/search/images/search-do-fixed.png b/src/pages/components/search/images/search-do-fixed.png
new file mode 100644
index 00000000000..6a7430fcfb9
Binary files /dev/null and b/src/pages/components/search/images/search-do-fixed.png differ
diff --git a/src/pages/components/search/images/search-do-fluid.png b/src/pages/components/search/images/search-do-fluid.png
new file mode 100644
index 00000000000..56bead75a08
Binary files /dev/null and b/src/pages/components/search/images/search-do-fluid.png differ
diff --git a/src/pages/components/search/images/search-sizes-fixed.png b/src/pages/components/search/images/search-sizes-fixed.png
new file mode 100644
index 00000000000..3fedd0fc85c
Binary files /dev/null and b/src/pages/components/search/images/search-sizes-fixed.png differ
diff --git a/src/pages/components/search/images/search-sizes-fluid.png b/src/pages/components/search/images/search-sizes-fluid.png
new file mode 100644
index 00000000000..1b91e13cf14
Binary files /dev/null and b/src/pages/components/search/images/search-sizes-fluid.png differ
diff --git a/src/pages/components/search/images/search-states-fixed.png b/src/pages/components/search/images/search-states-fixed.png
new file mode 100644
index 00000000000..99dba897e3e
Binary files /dev/null and b/src/pages/components/search/images/search-states-fixed.png differ
diff --git a/src/pages/components/search/images/search-states-fluid.png b/src/pages/components/search/images/search-states-fluid.png
new file mode 100644
index 00000000000..3671c947c57
Binary files /dev/null and b/src/pages/components/search/images/search-states-fluid.png differ
diff --git a/src/pages/components/search/images/search-style-1.png b/src/pages/components/search/images/search-style-1.png
index 85cefb5f865..52a9296e7f9 100644
Binary files a/src/pages/components/search/images/search-style-1.png and b/src/pages/components/search/images/search-style-1.png differ
diff --git a/src/pages/components/search/images/search-style-2.png b/src/pages/components/search/images/search-style-2.png
deleted file mode 100644
index ae39473f3bd..00000000000
Binary files a/src/pages/components/search/images/search-style-2.png and /dev/null differ
diff --git a/src/pages/components/search/images/search-style-3.png b/src/pages/components/search/images/search-style-3.png
deleted file mode 100644
index a8ba46d28d6..00000000000
Binary files a/src/pages/components/search/images/search-style-3.png and /dev/null differ
diff --git a/src/pages/components/search/images/search-style-4.png b/src/pages/components/search/images/search-style-4.png
deleted file mode 100644
index a5f12c91793..00000000000
Binary files a/src/pages/components/search/images/search-style-4.png and /dev/null differ
diff --git a/src/pages/components/search/images/search-style-fixed-2.png b/src/pages/components/search/images/search-style-fixed-2.png
new file mode 100644
index 00000000000..f2d0f60143c
Binary files /dev/null and b/src/pages/components/search/images/search-style-fixed-2.png differ
diff --git a/src/pages/components/search/images/search-style-fixed-3a.png b/src/pages/components/search/images/search-style-fixed-3a.png
new file mode 100644
index 00000000000..9744c11da3a
Binary files /dev/null and b/src/pages/components/search/images/search-style-fixed-3a.png differ
diff --git a/src/pages/components/search/images/search-style-fixed-3b.png b/src/pages/components/search/images/search-style-fixed-3b.png
new file mode 100644
index 00000000000..b3695423e32
Binary files /dev/null and b/src/pages/components/search/images/search-style-fixed-3b.png differ
diff --git a/src/pages/components/search/images/search-style-fixed-3c.png b/src/pages/components/search/images/search-style-fixed-3c.png
new file mode 100644
index 00000000000..782f5ed8f43
Binary files /dev/null and b/src/pages/components/search/images/search-style-fixed-3c.png differ
diff --git a/src/pages/components/search/images/search-style-fluid-2.png b/src/pages/components/search/images/search-style-fluid-2.png
new file mode 100644
index 00000000000..c092e17445b
Binary files /dev/null and b/src/pages/components/search/images/search-style-fluid-2.png differ
diff --git a/src/pages/components/search/images/search-style-fluid-3a.png b/src/pages/components/search/images/search-style-fluid-3a.png
new file mode 100644
index 00000000000..00165861ac7
Binary files /dev/null and b/src/pages/components/search/images/search-style-fluid-3a.png differ
diff --git a/src/pages/components/search/images/search-styles.png b/src/pages/components/search/images/search-styles.png
new file mode 100644
index 00000000000..15ba1278c3c
Binary files /dev/null and b/src/pages/components/search/images/search-styles.png differ
diff --git a/src/pages/components/search/images/search-usage-1.png b/src/pages/components/search/images/search-usage-1.png
deleted file mode 100644
index 505959125c2..00000000000
Binary files a/src/pages/components/search/images/search-usage-1.png and /dev/null differ
diff --git a/src/pages/components/search/style.mdx b/src/pages/components/search/style.mdx
index 76fb1e0dda3..08a35050d79 100755
--- a/src/pages/components/search/style.mdx
+++ b/src/pages/components/search/style.mdx
@@ -1,24 +1,20 @@
---
title: Search
description:
- Search enables users to specify a word or a phrase to find relevant pieces of
- content without the use of navigation.
+ Search enables users to specify a word or a phrase to find relevant content
+ without navigation.
tabs: ['Usage', 'Style', 'Code', 'Accessibility']
---
## Color
-Inputs come in two different colors. The default input color is `$field-01` and
-is used on `$ui-background` and `$ui-02` page backgrounds. The `--light` version
-input color is `$field-02` and is used on `$ui-01` page backgrounds.
-
-| Element | Property | Color token |
-| ----------- | ---------------- | ------------------- |
-| Field | background-color | `$field` \* |
-| | border-bottom | `$border-strong` \* |
-| Field text | text color | `$text-primary` |
-| Prompt text | text color | `$text-placeholder` |
-| Icon | fill | `$icon-secondary` |
+| Element | Property | Color token |
+| ------------------ | ---------------- | ------------------- |
+| Field | background-color | `$field` \* |
+| | border-bottom | `$border-strong` \* |
+| Label text (fluid) | text-color | `$text-secondary` |
+| Placeholder text | text-color | `$text-placeholder` |
+| Search icon | fill | `$icon-secondary` |
* Denotes a contextual color token that will change values based on the layer
@@ -26,68 +22,123 @@ input color is `$field-02` and is used on `$ui-01` page backgrounds.
-![Example of Search using $field-01](images/search-style-4.png)
+![Example of search](images/search-style-1.png)
-
Example of Search using $field
+
Example of search
### Interactive colors
-| Element | Property | Color token |
-| ------------------- | ---------------- | ---------------- |
-| Input:focus | border | `$focus` |
-| Field:disabled | background-color | `$field` \* |
-| | border-bottom | transparent |
-| Field text:disabled | text color | `$text-disabled` |
-| Icon:disabled | fill | `$icon-disabled` |
+| State | Element | Property | Color token |
+| -------- | ------------------ | ------------- | ------------------- |
+| Focus | Field | border | `$focus` |
+| Filled | Field text | text-color | `$text-primary` |
+| | Close icon | fill | `$icon-primary` |
+| Disabled | Field text | text-color | `$text-dsiabled` |
+| | Label text (fluid) | text-color | `$text-disabled` |
+| | Search icon | fill | `$icon-disabled` |
+| | Field (fluid) | border-bottom | `$border-subtle` \* |
-
+
+
-![Enabled, focus, and disabled search states](images/search-style-1.png)
+
-
+
+
+![Examples of focus, filled, and disabled search states](images/search-style-fixed-2.png)
+
+
+
+
+
+![Examples of focus, filled, and disabled search states](images/search-style-fluid-2.png)
+
+
-
Examples of enabled, focus, and disabled search states
+
+
+
+
## Typography
Search text should be set in sentence case, with only the first letter of the
first word capitalized.
-| Element | Font-size (px/rem) | Font-weight | Type token |
-| ---------- | ------------------ | ------------- | ------------------ |
-| Field text | 14 / 0.875 | Regular / 400 | `$body-compact-01` |
+| Element | Font-size (px/rem) | Font-weight | Type token |
+| ------------------ | ------------------ | ------------- | ------------------ |
+| Field text | 14 / 0.875 | Regular / 400 | `$body-compact-01` |
+| Label text (fluid) | 12 / 0.75 | Regular / 400 | `$label-01` |
## Structure
+#### Default inputs
+
The width of the search field should appropriately fit the design and layout of
-content.
+content. The width may vary based on the grid and layout.
| Element | Property | px / rem | Spacing token |
| ---------------------------- | --------------------------- | -------- | ------------- |
| Search icon Close icon | height, width | 16 / 1 | – |
-| Large field | padding-left, padding-right | 48 / 3 | `$spacing-09` |
| Small field | padding-left, padding-right | 32 / 2 | `$spacing-07` |
+| Medium field | padding-left, padding-right | 40 / 2.5 | `$spacing-08` |
+| Large field | padding-left, padding-right | 48 / 3 | `$spacing-09` |
-![Structure and spacing measurements for large search](images/search-style-2.png)
+![Structure and spacing measurements for default small search](images/search-style-fixed-3a.png)
- Structure and spacing measurements for large search | px | rem
+ Structure and spacing measurements for default small search | px | rem
-![Structure and spacing measurements for small search](images/search-style-3.png)
+![Structure and spacing measurements for default medium search](images/search-style-fixed-3b.png)
+
+
+
+
+ Structure and spacing measurements for default medium search | px | rem
+
+
+
+
+![Structure and spacing measurements for default large search](images/search-style-fixed-3c.png)
+
+
+
+
+ Structure and spacing measurements for default large search | px | rem
+
+
+#### Fluid inputs
+
+The width of the search field should appropriately fit the design and layout of
+content. The width may vary based on the grid and layout.
+
+| Element | Property | px / rem | Spacing token |
+| ----------- | --------------------------- | ---------- | ------------- |
+| Label | margin-bottom | 4 / 0.25 | `$spacing-02` |
+| Field | padding-left | 16 / 1 | `$spacing-05` |
+| | padding-right | 80 / 5 | `$spacing-11` |
+| | border | 1px | – |
+| | margin-top, margin-bottom | 13 / .8125 | – |
+| Close icon | padding-right, padding-left | 12 / .75 | `$spacing-04` |
+| Search icon | padding-right, padding-left | 12 / .75 | `$spacing-04` |
+
+
+
+![Structure and spacing measurements for fluid search](images/search-style-fluid-3a.png)
- Structure and spacing measurements for small search | px | rem
+ Structure and spacing measurements for fluid search | px | rem
## Sizes
diff --git a/src/pages/components/search/usage.mdx b/src/pages/components/search/usage.mdx
index 72faeb498a4..62325f8d6ea 100755
--- a/src/pages/components/search/usage.mdx
+++ b/src/pages/components/search/usage.mdx
@@ -1,15 +1,15 @@
---
title: Search
description:
- Search enables users to specify a word or a phrase to find relevant pieces of
- content without the use of navigation.
+ Search enables users to specify a word or a phrase to find relevant content
+ without navigation.
tabs: ['Usage', 'Style', 'Code', 'Accessibility']
---
-Search enables users to specify a word or a phrase to find relevant pieces of
-content without the use of navigation.
+Search enables users to specify a word or a phrase to find relevant content
+without navigation.
@@ -17,8 +17,10 @@ content without the use of navigation.
OverviewLive demo
-VariantsFormatting
+Content
+Behaviors
+RelatedFeedback
@@ -26,8 +28,22 @@ content without the use of navigation.
## Overview
Search offers users a way to explore a website or application using keywords.
-Search can be used as the primary means of discovering content, or as a filter
-to aid the user in finding content.
+Search can be used as the primary means of discovering content or as a filter to
+aid the user in finding content.
+
+### When to use
+
+- To help users find data more efficiently within a complex or large data set.
+- Use at a global level when searching an entire site.
+- Use at a page level when searching through content on one page specifically.
+- Use at a component level when searching data in a component, like a
+ [data table](https://carbondesignsystem.com/components/data-table/usage/#search).
+
+### When not to use
+
+- Do not use when there is small or limited amounts of data.
+- Do not use when the information is simple and can be found easily within one
+ view.
## Live demo
@@ -61,46 +77,227 @@ to aid the user in finding content.
-## Variants
+## Formatting
-| Variant | Purpose |
-| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Large search | This should be used at a global level when the user is searching content within a page view. |
-| Small search | Choose small when there are space constraints in your design. It can also be component-specific. For example, small search can be used to filter data within a [data table](/components/data-table/usage). |
+### Anatomy
-## Formatting
+1. **Field:** The place where a user enters their search query.
+2. **Search icon:** Signifies a search field. The magnifying glass icon is a
+ universal way to indicate search.
+3. **Field text:** Inputted search text by the user. Placeholder text is visible
+ before the user types into the field.
+4. **Close icon:** Appears after the user has actively typed into the search
+ field. Acts as a function to clear the search field.
+
+
+
+
+
+
+
+
+![Default search anatomy](images/search-anatomy-fixed.png)
+
+
+
+
+
+![Fluid search anatomy](images/search-anatomy-fluid.png)
+
+
+
+
+
+
+
+
+### Styling
+
+There are two styles of search, default and fluid. They share the same
+functionality but look visually different, influencing where to use them.
+
+| Style | Appearance | Use case |
+| ------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| Default | A traditional style where there is no label indicated. | Use when white space is needed between components. For example, a default search style is typically used at a global or page level. |
+| Fluid | An alternative style where a label is placed inside of the search field and is stacked inline with the user input field text. | Use in expressive moments, fluid forms, and contained spaces. |
+
+
+
+
+![Default and fluid search styles](images/search-styles.png)
+
+
+
+
+
+ A default style input is shown on the top and fluid style is on the bottom.
+
+
+### Sizing
+
+#### Default input heights
+
+There are three default search height sizes: small, medium, and large. The width
+varies in size based on content, layout, and design. Supporting three different
+search sizes gives you more flexibility when structuring layouts.
+
+| Size | Height (px/rem) | Use case |
+| ----------- | --------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Small (sm) | 32 / 2 | Use when space is constricted within a design. |
+| Medium (md) | 40 / 2.5 | This is the default size and the most commonly used size. When in doubt, use the medium size. |
+| Large (lg) | 48 / 3 | Use when there is a lot of space to work with. The large size is typically at a global level when the user is searching content within a page view. |
-![Search at the top of the data table](images/search-usage-1.png)
+![Default search sizes](images/search-sizes-fixed.png)
-### Search fields
-
-Set the user's context for the search with helpful placeholder text within the
-search field (search documents), that pertains to the page or section the search
-box is in. Search in the global header should just say search.
-
-Accessibility note: If the search component's label and placeholder text differ,
-VoiceOver on macOS will read both.
-
-### Search results
-
-- Clearly show which results are being displayed with labels or headers (i.e.
- Results for X).
-- Categorize the search results if they come from different areas (eg. docs,
- services, apps, tutorials, blogs).
-- Give the user control over their viewing options and ability to sort results
- (eg. relevancy, popularity, ratings, date).
-- Have a clear, “no results”, message and offer suggestions if possible.
-- Have smart algorithms that can search for similar terms or can search even
- with misspelled words.
-- Include enough of a description in the results for users to make a judgement
- as to whether that particular result is relevant.
-- Highlight the search term in the results, where appropriate.
+#### Fluid input height
+
+There is only one input height at 64px and it is visually larger than the
+default heights.
+
+
+
+
+![Fluid search size](images/search-sizes-fluid.png)
+
+
+
+
+### Placement
+
+Place the search component within a user interface where users expect to find it
+and where it is appropriate for how it is being used in context, whether at a
+global level, page-specific level, or within a component.
+
+The default search can be arranged on the grid to align the container with other
+components containers. Search can also hang to align with other hanging
+component containers on the same page, depending on the use case.
+
+
+
+
+![Do align the default search container vertically with other text on the page.](images/search-do-fixed.png)
+
+
+
+
+
+
+
+![Do hang the fluid search container with other hanging components.](images/search-do-fluid.png)
+
+
+
+
+## Content
+
+### Main elements
+
+#### Placeholder text
+
+Useful and short text hinting at what the user can search for. For example,
+“Search for networks or devices.”
+
+#### Field text
+
+- Key words entered by the user to find a search result.
+- Keep the field text concise and relate the field text as closely to the result
+ you want to find.
+
+### Further guidance
+
+For further content guidance, see Carbon’s
+[content guidelines](https://carbondesignsystem.com/guidelines/content/overview/).
+
+## Behaviors
+
+### States
+
+The search component has four states: enabled, focus, filled, and disabled.
+
+
+
+
+
+
+
+
+![Default search states](images/search-states-fixed.png)
+
+
+
+
+
+![Fluid search states](images/search-states-fluid.png)
+
+
+
+
+
+
+
+
+### Interactions
+
+#### Mouse
+
+Click on the search field input to start typing. Once a user starts typing, a
+close icon (‘x’) will appear and provides a way to clear the input field by
+clicking on the Close icon.
+
+#### Keyboard
+
+Press `Enter` to submit text as a search term, or press `Esc` to clear the
+search field. Once a user starts typing, a Close icon (‘x’) will appear and
+provides a way to clear the input field by pressing the `Space`or `Enter` keys.
+
+
+
+
+
+
+
+
+![Default search click areas](images/search-click-area-fixed.png)
+
+
+
+
+
+![Fluid search click areas](images/search-click-area-fluid.png)
+
+
+
+
+
+
+
+
+## Related
+
+
+
+
+#### Components
+
+- [Data table](https://carbondesignsystem.com/components/data-table/usage/)
+- [UI shell header](https://carbondesignsystem.com/components/UI-shell-header/usage/)
+
+
+
+
+#### Patterns
+
+- [Filtering](https://carbondesignsystem.com/patterns/filtering/)
+- [Search](https://carbondesignsystem.com/patterns/search-pattern/)
+
+
+
## Feedback
diff --git a/src/pages/components/select/images/select-anatomy-fixed.png b/src/pages/components/select/images/select-anatomy-fixed.png
new file mode 100644
index 00000000000..fad601b4981
Binary files /dev/null and b/src/pages/components/select/images/select-anatomy-fixed.png differ
diff --git a/src/pages/components/select/images/select-anatomy-fluid.png b/src/pages/components/select/images/select-anatomy-fluid.png
new file mode 100644
index 00000000000..09f7f9106e9
Binary files /dev/null and b/src/pages/components/select/images/select-anatomy-fluid.png differ
diff --git a/src/pages/components/select/images/select-invalid-state-fixed.png b/src/pages/components/select/images/select-invalid-state-fixed.png
new file mode 100644
index 00000000000..b24bd5875ac
Binary files /dev/null and b/src/pages/components/select/images/select-invalid-state-fixed.png differ
diff --git a/src/pages/components/select/images/select-invalid-state-fluid.png b/src/pages/components/select/images/select-invalid-state-fluid.png
new file mode 100644
index 00000000000..43b8fd7ad57
Binary files /dev/null and b/src/pages/components/select/images/select-invalid-state-fluid.png differ
diff --git a/src/pages/components/select/images/select-keyboard-interaction-fixed.png b/src/pages/components/select/images/select-keyboard-interaction-fixed.png
new file mode 100644
index 00000000000..780a8ed9abf
Binary files /dev/null and b/src/pages/components/select/images/select-keyboard-interaction-fixed.png differ
diff --git a/src/pages/components/select/images/select-keyboard-interaction-fluid.png b/src/pages/components/select/images/select-keyboard-interaction-fluid.png
new file mode 100644
index 00000000000..19a2d64a1de
Binary files /dev/null and b/src/pages/components/select/images/select-keyboard-interaction-fluid.png differ
diff --git a/src/pages/components/select/images/select-menu-order.png b/src/pages/components/select/images/select-menu-order.png
new file mode 100644
index 00000000000..f30e87a98a0
Binary files /dev/null and b/src/pages/components/select/images/select-menu-order.png differ
diff --git a/src/pages/components/select/images/select-mouse-interaction-fixed.png b/src/pages/components/select/images/select-mouse-interaction-fixed.png
new file mode 100644
index 00000000000..62bb4ad4cf2
Binary files /dev/null and b/src/pages/components/select/images/select-mouse-interaction-fixed.png differ
diff --git a/src/pages/components/select/images/select-mouse-interaction-fluid.png b/src/pages/components/select/images/select-mouse-interaction-fluid.png
new file mode 100644
index 00000000000..b2a76e50e19
Binary files /dev/null and b/src/pages/components/select/images/select-mouse-interaction-fluid.png differ
diff --git a/src/pages/components/select/images/select-sizes-fixed.png b/src/pages/components/select/images/select-sizes-fixed.png
new file mode 100644
index 00000000000..88bad92c2ea
Binary files /dev/null and b/src/pages/components/select/images/select-sizes-fixed.png differ
diff --git a/src/pages/components/select/images/select-sizes-fluid.png b/src/pages/components/select/images/select-sizes-fluid.png
new file mode 100644
index 00000000000..9856dc45312
Binary files /dev/null and b/src/pages/components/select/images/select-sizes-fluid.png differ
diff --git a/src/pages/components/select/images/select-states-fixed.png b/src/pages/components/select/images/select-states-fixed.png
new file mode 100644
index 00000000000..4b28a6f4f39
Binary files /dev/null and b/src/pages/components/select/images/select-states-fixed.png differ
diff --git a/src/pages/components/select/images/select-states-fluid.png b/src/pages/components/select/images/select-states-fluid.png
new file mode 100644
index 00000000000..c9693dcb802
Binary files /dev/null and b/src/pages/components/select/images/select-states-fluid.png differ
diff --git a/src/pages/components/select/images/select-style-1.png b/src/pages/components/select/images/select-style-1.png
deleted file mode 100644
index d3a606d39ab..00000000000
Binary files a/src/pages/components/select/images/select-style-1.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-style-2.png b/src/pages/components/select/images/select-style-2.png
deleted file mode 100644
index c719eec9d8f..00000000000
Binary files a/src/pages/components/select/images/select-style-2.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-style-3.png b/src/pages/components/select/images/select-style-3.png
deleted file mode 100644
index 320468efe3b..00000000000
Binary files a/src/pages/components/select/images/select-style-3.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-style-4.png b/src/pages/components/select/images/select-style-4.png
deleted file mode 100644
index bfa02a7f947..00000000000
Binary files a/src/pages/components/select/images/select-style-4.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-style-6.png b/src/pages/components/select/images/select-style-6.png
deleted file mode 100644
index aaef88400a8..00000000000
Binary files a/src/pages/components/select/images/select-style-6.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-style-color-fixed.png b/src/pages/components/select/images/select-style-color-fixed.png
new file mode 100644
index 00000000000..da3a4ebf5a4
Binary files /dev/null and b/src/pages/components/select/images/select-style-color-fixed.png differ
diff --git a/src/pages/components/select/images/select-style-color-fluid.png b/src/pages/components/select/images/select-style-color-fluid.png
new file mode 100644
index 00000000000..1e9a265e26d
Binary files /dev/null and b/src/pages/components/select/images/select-style-color-fluid.png differ
diff --git a/src/pages/components/select/images/select-style-states-fixed.png b/src/pages/components/select/images/select-style-states-fixed.png
new file mode 100644
index 00000000000..4b28a6f4f39
Binary files /dev/null and b/src/pages/components/select/images/select-style-states-fixed.png differ
diff --git a/src/pages/components/select/images/select-style-states-fluid.png b/src/pages/components/select/images/select-style-states-fluid.png
new file mode 100644
index 00000000000..c9693dcb802
Binary files /dev/null and b/src/pages/components/select/images/select-style-states-fluid.png differ
diff --git a/src/pages/components/select/images/select-style-structure-default-fixed.png b/src/pages/components/select/images/select-style-structure-default-fixed.png
new file mode 100644
index 00000000000..47d09d35a3b
Binary files /dev/null and b/src/pages/components/select/images/select-style-structure-default-fixed.png differ
diff --git a/src/pages/components/select/images/select-style-structure-default-fluid.png b/src/pages/components/select/images/select-style-structure-default-fluid.png
new file mode 100644
index 00000000000..0fb836d7c38
Binary files /dev/null and b/src/pages/components/select/images/select-style-structure-default-fluid.png differ
diff --git a/src/pages/components/select/images/select-style-structure-inline-fixed.png b/src/pages/components/select/images/select-style-structure-inline-fixed.png
new file mode 100644
index 00000000000..43a431aadac
Binary files /dev/null and b/src/pages/components/select/images/select-style-structure-inline-fixed.png differ
diff --git a/src/pages/components/select/images/select-styles.png b/src/pages/components/select/images/select-styles.png
new file mode 100644
index 00000000000..b37e8bb745a
Binary files /dev/null and b/src/pages/components/select/images/select-styles.png differ
diff --git a/src/pages/components/select/images/select-usage-1.gif b/src/pages/components/select/images/select-usage-1.gif
deleted file mode 100644
index 27fc041faed..00000000000
Binary files a/src/pages/components/select/images/select-usage-1.gif and /dev/null differ
diff --git a/src/pages/components/select/images/select-usage-10.png b/src/pages/components/select/images/select-usage-10.png
deleted file mode 100644
index e6c4690db05..00000000000
Binary files a/src/pages/components/select/images/select-usage-10.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-usage-11.png b/src/pages/components/select/images/select-usage-11.png
deleted file mode 100644
index eb980af6697..00000000000
Binary files a/src/pages/components/select/images/select-usage-11.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-usage-12.png b/src/pages/components/select/images/select-usage-12.png
deleted file mode 100644
index df2d90d911d..00000000000
Binary files a/src/pages/components/select/images/select-usage-12.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-usage-5.png b/src/pages/components/select/images/select-usage-5.png
deleted file mode 100644
index 6095e1fc719..00000000000
Binary files a/src/pages/components/select/images/select-usage-5.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-usage-6.png b/src/pages/components/select/images/select-usage-6.png
deleted file mode 100644
index 22849f56c88..00000000000
Binary files a/src/pages/components/select/images/select-usage-6.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-usage-7.png b/src/pages/components/select/images/select-usage-7.png
deleted file mode 100644
index d2e247961d0..00000000000
Binary files a/src/pages/components/select/images/select-usage-7.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-usage-8.png b/src/pages/components/select/images/select-usage-8.png
deleted file mode 100644
index 9d08a52d5ba..00000000000
Binary files a/src/pages/components/select/images/select-usage-8.png and /dev/null differ
diff --git a/src/pages/components/select/images/select-usage-9.png b/src/pages/components/select/images/select-usage-9.png
deleted file mode 100644
index 2929a1caaf3..00000000000
Binary files a/src/pages/components/select/images/select-usage-9.png and /dev/null differ
diff --git a/src/pages/components/select/style.mdx b/src/pages/components/select/style.mdx
index ddc3d1a72f6..c24858fc369 100755
--- a/src/pages/components/select/style.mdx
+++ b/src/pages/components/select/style.mdx
@@ -23,32 +23,70 @@ tabs: ['Usage', 'Style', 'Code', 'Accessibility']
it is placed on.
-
+
+
-![Default and new selection state examples for Select](images/select-style-1.png)
+
-
+
-
Examples of default and new selection select states
+![Select interactive states](images/select-style-color-fixed.png)
-### Interaction states
+
-| Element | Property | Color token |
-| ------------------- | ------------- | ---------------- |
-| Input:focus | border | `$focus` |
-| Input:invalid | border | `$support-error` |
-| Error message | text color | `$support-error` |
-| Input:disabled | background | `$field` \* |
-| | border-bottom | transparent |
-| Field text:disabled | text color | `$text-disabled` |
+
-
+![Select interactive states](images/select-style-color-fluid.png)
-![Open, disabled, and more information/help state examples for Select](images/select-style-3.png)
+
-
+
+
+
+
+
+### Interactive states
+
+| State | Element | Property | Color token |
+| -------- | --------------- | ---------------- | ------------------- |
+| Hover | Field | background-color | `$field-hover` \* |
+| Focus | Field | border | `$focus` |
+| Invalid | Field | border | `$support-error` |
+| | Error message | text-color | `$text-error` |
+| | Error icon | fill | `$support-error` |
+| Warning | Warning message | text-color | `$text-primary` |
+| | Warning icon | fill | `$support-warning` |
+| Disabled | Field | background-color | `$field` \* |
+| | Input text | text-color | `$text-disabled |
+| | Field | border-bottom | transparent |
+| | Field (fluid) | border-bottom | `$border-subtle` \* |
+| | Label | text-color | `$text-disabled` |
+| | Chevron icon | fill | `$icon-disabled` |
+
+- Denotes a contextual color token that will change values based on the layer it
+ is placed on.
+
+
+
+
+
+
+
+
+![Select interactive states](images/select-style-states-fixed.png)
+
+
+
+
+
+![Select interactive states](images/select-style-states-fluid.png)
+
+
+
+
-
Examples of open, disabled, and help select states
-![Structure and spacing measurements for select](images/select-style-2.png)
+![Structure and spacing measurements for default select](images/select-style-structure-default-fixed.png)
-
Structure and spacing measurements for select | px / rem
+
+ Structure and spacing measurements for default select | px / rem
+
-![Structure and spacing measurements for Inline Select](images/select-style-6.png)
+![Structure and spacing measurements for Inline Select](images/select-style-structure-default-fluid.png)
- Structure and spacing measurements for inline select (focused) | px / rem
+ Structure and spacing measurements for fluid select | px / rem
## Size
diff --git a/src/pages/components/select/usage.mdx b/src/pages/components/select/usage.mdx
index 0106c3a2399..53634a5d466 100755
--- a/src/pages/components/select/usage.mdx
+++ b/src/pages/components/select/usage.mdx
@@ -191,7 +191,21 @@ Inline selects have less visual weight on a page because they are borderless.
-![Select anatomy image](images/select-usage-5.png)
+
+
+
+
+![Select anatomy](images/select-anatomy-fixed.png)
+
+
+
+
+
+![Select anatomy](images/select-anatomy-fluid.png)
+
+
+
+
@@ -201,7 +215,8 @@ Inline selects have less visual weight on a page because they are borderless.
2. **Default option:** Usually a frequent option that users would choose from a
select list.
3. **Helper text** (optional, except for error and warning): Assistive text to
- help the user choose the right selection.
+ help the user choose the right selection. Helper text is shown in a tooltip
+ for fluid styles.
4. **Field:** Persists when the dropdown is open or closed.
5. **Option:** A choice for the user, shown with other choices in a menu.
6. **Menu:** A list of options to choose from, displayed as an open state.
@@ -209,25 +224,67 @@ Inline selects have less visual weight on a page because they are borderless.
8. **Error or Warning text**: It replaces the helper text when an error or
warning state appears.
+### Styling
+
+There are two styles of select inputs, default and fluid. They share the same
+functionality but look visually different, influencing where to use them.
+
+| Style | Appearance | Use case |
+| ------- | ------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Default | A traditional style where the label is positioned outside and above the input field. | Use when white space is needed between input components or in productive moments where space is at a premium, and smaller components are needed. |
+| Fluid | An alternative style where the label is placed inside of the input field and is stacked inline with the user input text. | Use in expressive moments, fluid forms, contained spaces, or attached to complex components, like a toolbar. |
+
+
+
+
+![Default and fluid select styles](images/select-styles.png)
+
+
+
+
### Sizing
-Select has three sizes for both variants: **small**, **medium**, and **large**.
-The width varies in size based on content, layout, and design.
+#### Default input heights
-| Size | Height (px/rem) | Use case |
-| ----------- | --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| Small (sm) | 32 / 2 | Use when space is constricted or when placing a select in a form that is long and complex. |
-| Medium (md) | 40 / 2.5 | This is the default size and the most commonly used size. When in doubt, use the medium size. |
-| Large (lg) | 48 / 3 | Use when there is a lot of space to work with. The large size is typically used in simple forms or when a select is placed by itself on a page. |
+There are three default select height size for both variants: small, medium, and
+large. Supporting three different select sizes gives you more flexibility when
+structuring layouts. However, use a consistent size for all form components on
+the same page. For example, if you are using a medium size select also use the
+same size text inputs, buttons, and so on. When in doubt, use the default medium
+size height.
+
+| Default size | Height (px/rem) | Use case |
+| ------------ | --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| Small (sm) | 32 / 2 | Use when space is constricted or when placing a select in a form that is long and complex. |
+| Medium (md) | 40 / 2.5 | This is the default size and the most commonly used size. When in doubt, use the medium size. |
+| Large (lg) | 48 / 3 | Use when there is a lot of space to work with. The large size is typically used in simple forms or when a select is placed by itself on a page. |
-![Select default sizes](images/select-usage-6.png)
+![Select default sizes](images/select-sizes-fixed.png)
+
+
+
+
+#### Fluid inputs heights
+
+In the fluid select, there is only one input height. The menu height is
+controlled by the browser.
+
+
+
+
+![Select fluid size](images/select-sizes-fluid.png)
+#### Width
+
+There is no minimum or maximum width for a select. The width can be customized
+appropriately for its context.
+
## Content
### Main elements
@@ -253,7 +310,7 @@ relative to the content.
-![Select order](images/select-usage-8.png)
+![Select menu order](images/select-menu-order.png)
@@ -285,7 +342,21 @@ The select has multiple interactive states for both default and inline variants:
-![Select interactive states](images/select-usage-9.png)
+
+
+
+
+![Select interactive states](images/select-states-fixed.png)
+
+
+
+
+
+![Select interactive states](images/select-states-fluid.png)
+
+
+
+
@@ -302,7 +373,21 @@ anywhere inside an option container.
-![Select mouse interaction](images/select-usage-10.png)
+
+
+
+
+![Select mouse interaction](images/select-mouse-interaction-fixed.png)
+
+
+
+
+
+![Select mouse interaction](images/select-mouse-interaction-fluid.png)
+
+
+
+
@@ -322,7 +407,21 @@ anywhere inside an option container.
-![Select keyboard interaction](images/select-usage-11.png)
+
+
+
+
+![Select keyboard interaction](images/select-keyboard-interaction-fixed.png)
+
+
+
+
+
+![Select keyboard interaction](images/select-keyboard-interaction-fluid.png)
+
+
+
+
@@ -339,7 +438,21 @@ red border, an error icon indicator, and an error message.
-![Select invalid state](images/select-usage-12.png)
+
+
+
+
+![Select invalid state](images/select-invalid-state-fixed.png)
+
+
+
+
+
+![Select invalid state](images/select-invalid-state-fluid.png)
+
+
+
+
diff --git a/src/pages/components/text-input/images/text-area-anatomy-fixed.png b/src/pages/components/text-input/images/text-area-anatomy-fixed.png
new file mode 100644
index 00000000000..f4447800df1
Binary files /dev/null and b/src/pages/components/text-input/images/text-area-anatomy-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-area-anatomy-fluid.png b/src/pages/components/text-input/images/text-area-anatomy-fluid.png
new file mode 100644
index 00000000000..fb72d10b7c8
Binary files /dev/null and b/src/pages/components/text-input/images/text-area-anatomy-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-area-counter.png b/src/pages/components/text-input/images/text-area-counter.png
index 72193f8b159..30212357b6d 100644
Binary files a/src/pages/components/text-input/images/text-area-counter.png and b/src/pages/components/text-input/images/text-area-counter.png differ
diff --git a/src/pages/components/text-input/images/text-area-style-structure-fixed.png b/src/pages/components/text-input/images/text-area-style-structure-fixed.png
new file mode 100644
index 00000000000..34027595ed7
Binary files /dev/null and b/src/pages/components/text-input/images/text-area-style-structure-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-area-style-structure-fluid.png b/src/pages/components/text-input/images/text-area-style-structure-fluid.png
new file mode 100644
index 00000000000..9447713a094
Binary files /dev/null and b/src/pages/components/text-input/images/text-area-style-structure-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-area-usage-anatomy-fixed.png b/src/pages/components/text-input/images/text-area-usage-anatomy-fixed.png
new file mode 100644
index 00000000000..f4447800df1
Binary files /dev/null and b/src/pages/components/text-input/images/text-area-usage-anatomy-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-area-usage-anatomy-fluid.png b/src/pages/components/text-input/images/text-area-usage-anatomy-fluid.png
new file mode 100644
index 00000000000..fb72d10b7c8
Binary files /dev/null and b/src/pages/components/text-input/images/text-area-usage-anatomy-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-area-usage-counter.png b/src/pages/components/text-input/images/text-area-usage-counter.png
index b9299aafd76..1c9e0fe3f9a 100644
Binary files a/src/pages/components/text-input/images/text-area-usage-counter.png and b/src/pages/components/text-input/images/text-area-usage-counter.png differ
diff --git a/src/pages/components/text-input/images/text-area-usage-resize.png b/src/pages/components/text-input/images/text-area-usage-resize.png
index a17e9d365dd..6ba0cca1ce0 100644
Binary files a/src/pages/components/text-input/images/text-area-usage-resize.png and b/src/pages/components/text-input/images/text-area-usage-resize.png differ
diff --git a/src/pages/components/text-input/images/text-area-usage-size.png b/src/pages/components/text-input/images/text-area-usage-size.png
index c045a046ad2..1adcd560d40 100644
Binary files a/src/pages/components/text-input/images/text-area-usage-size.png and b/src/pages/components/text-input/images/text-area-usage-size.png differ
diff --git a/src/pages/components/text-input/images/text-input-anatomy-fixed.png b/src/pages/components/text-input/images/text-input-anatomy-fixed.png
new file mode 100644
index 00000000000..9262d5d21b1
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-anatomy-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-input-anatomy-fluid.png b/src/pages/components/text-input/images/text-input-anatomy-fluid.png
new file mode 100644
index 00000000000..6f3931fd21d
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-anatomy-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-mouse-fixed.png b/src/pages/components/text-input/images/text-input-mouse-fixed.png
new file mode 100644
index 00000000000..8a46a6308e0
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-mouse-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-input-mouse-fluid.png b/src/pages/components/text-input/images/text-input-mouse-fluid.png
new file mode 100644
index 00000000000..be4831d4666
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-mouse-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-style-1.png b/src/pages/components/text-input/images/text-input-style-1.png
deleted file mode 100644
index 90dd2a818a0..00000000000
Binary files a/src/pages/components/text-input/images/text-input-style-1.png and /dev/null differ
diff --git a/src/pages/components/text-input/images/text-input-style-2.png b/src/pages/components/text-input/images/text-input-style-2.png
deleted file mode 100644
index 7ada772180d..00000000000
Binary files a/src/pages/components/text-input/images/text-input-style-2.png and /dev/null differ
diff --git a/src/pages/components/text-input/images/text-input-style-color-fixed.png b/src/pages/components/text-input/images/text-input-style-color-fixed.png
new file mode 100644
index 00000000000..5fd90a78c2e
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-style-color-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-input-style-color-fluid.png b/src/pages/components/text-input/images/text-input-style-color-fluid.png
new file mode 100644
index 00000000000..7fa304be8eb
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-style-color-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-style-size.png b/src/pages/components/text-input/images/text-input-style-size.png
index 2c2b7c48f2e..477347b01a1 100644
Binary files a/src/pages/components/text-input/images/text-input-style-size.png and b/src/pages/components/text-input/images/text-input-style-size.png differ
diff --git a/src/pages/components/text-input/images/text-input-style-states-fixed.png b/src/pages/components/text-input/images/text-input-style-states-fixed.png
new file mode 100644
index 00000000000..b420319f037
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-style-states-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-input-style-states-fluid.png b/src/pages/components/text-input/images/text-input-style-states-fluid.png
new file mode 100644
index 00000000000..e6e0d092b0a
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-style-states-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-style-structure-fixed.png b/src/pages/components/text-input/images/text-input-style-structure-fixed.png
new file mode 100644
index 00000000000..619ade3d4a1
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-style-structure-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-input-style-structure-fluid.png b/src/pages/components/text-input/images/text-input-style-structure-fluid.png
new file mode 100644
index 00000000000..f42f1bc703a
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-style-structure-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-1.png b/src/pages/components/text-input/images/text-input-usage-1.png
index f978f2eadb6..7bbf6d5b7fc 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-1.png and b/src/pages/components/text-input/images/text-input-usage-1.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-2.png b/src/pages/components/text-input/images/text-input-usage-2.png
index 09663095f6f..3b4b27d1a5c 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-2.png and b/src/pages/components/text-input/images/text-input-usage-2.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-4-do-fluid.png b/src/pages/components/text-input/images/text-input-usage-4-do-fluid.png
new file mode 100644
index 00000000000..a4cc4a060ea
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-usage-4-do-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-4-do.png b/src/pages/components/text-input/images/text-input-usage-4-do.png
index 77a41150ebf..2fc120821ab 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-4-do.png and b/src/pages/components/text-input/images/text-input-usage-4-do.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-4-dont.png b/src/pages/components/text-input/images/text-input-usage-4-dont.png
index 7e1a4254182..952706874c6 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-4-dont.png and b/src/pages/components/text-input/images/text-input-usage-4-dont.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-anatomy-fixed.png b/src/pages/components/text-input/images/text-input-usage-anatomy-fixed.png
new file mode 100644
index 00000000000..9262d5d21b1
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-usage-anatomy-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-anatomy-fluid.png b/src/pages/components/text-input/images/text-input-usage-anatomy-fluid.png
new file mode 100644
index 00000000000..6f3931fd21d
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-usage-anatomy-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-anatomy.png b/src/pages/components/text-input/images/text-input-usage-anatomy.png
index 24147819ead..fd14669db0a 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-anatomy.png and b/src/pages/components/text-input/images/text-input-usage-anatomy.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-mouse-fixed.png b/src/pages/components/text-input/images/text-input-usage-mouse-fixed.png
new file mode 100644
index 00000000000..c29595157d2
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-usage-mouse-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-mouse-fluid.png b/src/pages/components/text-input/images/text-input-usage-mouse-fluid.png
new file mode 100644
index 00000000000..d4c345e4dab
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-usage-mouse-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-mouse.png b/src/pages/components/text-input/images/text-input-usage-mouse.png
index 1de96bfa819..53174d8d98d 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-mouse.png and b/src/pages/components/text-input/images/text-input-usage-mouse.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-optional-do.png b/src/pages/components/text-input/images/text-input-usage-optional-do.png
index e570949e8a7..714a14f70a8 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-optional-do.png and b/src/pages/components/text-input/images/text-input-usage-optional-do.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-password.png b/src/pages/components/text-input/images/text-input-usage-password.png
index dafe6aa826e..fa9670caa48 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-password.png and b/src/pages/components/text-input/images/text-input-usage-password.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-required-do.png b/src/pages/components/text-input/images/text-input-usage-required-do.png
index f1307b0e2a4..85a4a2c4dea 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-required-do.png and b/src/pages/components/text-input/images/text-input-usage-required-do.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-size-fluid.png b/src/pages/components/text-input/images/text-input-usage-size-fluid.png
new file mode 100644
index 00000000000..d11f26ac30e
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-usage-size-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-size.png b/src/pages/components/text-input/images/text-input-usage-size.png
index 409765e752a..fbe24481256 100644
Binary files a/src/pages/components/text-input/images/text-input-usage-size.png and b/src/pages/components/text-input/images/text-input-usage-size.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-states-fixed.png b/src/pages/components/text-input/images/text-input-usage-states-fixed.png
new file mode 100644
index 00000000000..78213c996d9
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-usage-states-fixed.png differ
diff --git a/src/pages/components/text-input/images/text-input-usage-states-fluid.png b/src/pages/components/text-input/images/text-input-usage-states-fluid.png
new file mode 100644
index 00000000000..e96c9455fc6
Binary files /dev/null and b/src/pages/components/text-input/images/text-input-usage-states-fluid.png differ
diff --git a/src/pages/components/text-input/images/text-input-width-do.png b/src/pages/components/text-input/images/text-input-width-do.png
index fadd775823e..b1cedc02aa1 100644
Binary files a/src/pages/components/text-input/images/text-input-width-do.png and b/src/pages/components/text-input/images/text-input-width-do.png differ
diff --git a/src/pages/components/text-input/images/text-input-width-dont.png b/src/pages/components/text-input/images/text-input-width-dont.png
index b581fb14e06..4ac0b6ec460 100644
Binary files a/src/pages/components/text-input/images/text-input-width-dont.png and b/src/pages/components/text-input/images/text-input-width-dont.png differ
diff --git a/src/pages/components/text-input/style.mdx b/src/pages/components/text-input/style.mdx
index b78a4d3a94f..bda6b3c98bf 100755
--- a/src/pages/components/text-input/style.mdx
+++ b/src/pages/components/text-input/style.mdx
@@ -25,35 +25,65 @@ tabs: ['Usage', 'Style', 'Code', 'Accessibility']
-![text input states](images/text-input-style-1.png)
+
+
+
+
+![Example of an enabled text input in the default style](images/text-input-style-color-fixed.png)
+
+
+
+
+
+![Example of an enabled text input in the fluid style](images/text-input-style-color-fluid.png)
+
+
+
+
### Interactive states
-| State | Element | Property | Color token |
-| -------- | ------------- | ------------- | ---------------- |
-| Focus | Field | outline | `$focus` |
-| Invalid | Field | outline | `$support-error` |
-| | Error message | text color | `$text-error` |
-| | Warning icon | svg | `$support-error` |
-| Disabled | Field | background | `$field` \* |
-| | Field | border-bottom | transparent |
-| | Field text | text color | `$text-disabled` |
+| State | Element | Property | Color token |
+| -------- | --------------- | ------------- | ------------------ |
+| Focus | Field | border | `$focus` |
+| Invalid | Field | border | `$support-error` |
+| | Error message | text color | `$text-error` |
+| | Error icon | svg | `$support-error` |
+| Warning | Warning message | text color | `$text-primary` |
+| | Warning icon | svg | `$support-warning` |
+| Disabled | Field | background | `$field` \* |
+| | Field | border-bottom | transparent |
+| | Field text | text color | `$text-disabled` |
-
+
+
+
+
+
+
+![Examples of text input states in the default style](images/text-input-style-states-fixed.png)
+
+
+
+
-![text input interactive states](images/text-input-style-3.png)
+![Examples of text input states in the fluid style](images/text-input-style-states-fluid.png)
+
+
+
+
## Typography
-Text input labels and placeholder text should be set in sentence case, with only
-the first word in a phrase and any proper nouns capitalized. Text input labels
+Text input labels and field text should be set in sentence case, with only the
+first word in a phrase and any proper nouns capitalized. Text input labels
should be three words or less.
| Element | Font-size (px/rem) | Font-weight | Type token |
@@ -65,27 +95,54 @@ should be three words or less.
## Structure
-### Text input
+### Text input – Default
-| Element | Property | px / rem | Spacing token |
-| ------------ | --------------------------- | -------- | ------------- |
-| Label | margin-bottom | 8 / 0.5 | `$spacing-03` |
-| Helper text | margin-top | 4 / 0.25 | `$spacing-02` |
-| Field text | padding-left, padding-right | 16 / 1 | `$spacing-05` |
-| Field | border-bottom | 1px | – |
-| Field: focus | border | 2px | – |
+| Element | Property | px / rem | Spacing token |
+| ----------- | --------------------------- | -------- | ------------- |
+| Label | margin-bottom | 8 / 0.5 | `$spacing-03` |
+| Helper text | margin-top | 4 / 0.25 | `$spacing-02` |
+| Input text | padding-left, padding-right | 16 / 1 | `$spacing-05` |
+| Field | border-bottom | 1px | – |
+| Focus | border | 2px | – |
+| Error | border | 2px | – |
-![Structure and spacing measurements for text input](images/text-input-style-2.png)
+![Structure and spacing measurements for default text input](images/text-input-style-structure-fixed.png)
-
Structure and spacing measurements for text input | px / rem
+
+ Structure and spacing measurements for default text input | px / rem
+
+
+![Structure and spacing measurements for fluid text input](images/text-input-style-structure-fluid.png)
+
+
+
+
+ Structure and spacing measurements for fluid text input | px / rem
+
+
+### Text area – Default
| Element | Property | px / rem | Spacing token |
| ------------ | --------------------------- | ----------- | ------------- |
@@ -99,14 +156,39 @@ should be three words or less.
-![Structure and spacing measurements for text area](images/text-area-style-1.png)
+![Structure and spacing measurements for default text area](images/text-area-style-structure-fixed.png)
+
+
+
+
+ Structure and spacing measurements for default text area | px / rem
+
+
+![Structure and spacing measurements for fluid text area](images/text-area-style-structure-fluid.png)
-
Structure and spacing measurements for text area | px / rem
+
+ Structure and spacing measurements for fluid text area | px / rem
+
## Sizes
+These sizes apply only to the default style of text input.
+
| Element | Size | Height (px / rem) |
| ------- | ----------- | ----------------- |
| Input | Small (sm) | 32 / 2 |
diff --git a/src/pages/components/text-input/usage.mdx b/src/pages/components/text-input/usage.mdx
index 7a0a35ab910..a42845ed2d4 100755
--- a/src/pages/components/text-input/usage.mdx
+++ b/src/pages/components/text-input/usage.mdx
@@ -17,12 +17,13 @@ and short-form entries.
OverviewLive demo
+Text input
+Text areaFormattingContentUniversal behaviors
-Text input
-Text area
-References
+Modifiers
+RelatedFeedback
@@ -34,6 +35,14 @@ used should reflect the length of the content you expect the user to enter. The
default text input is for short, one-line content, whereas text area is for
longer, multi-line entries.
+
+
+
+![Text input and text area example](images/text-input-usage-2.png)
+
+
+
+
#### When to use
- A user needs to input unique information that cannot be predicted with a
@@ -86,19 +95,17 @@ longer, multi-line entries.
'Web Components':
'https://web-components.carbondesignsystem.com/?path=/story/components-input--default',
}}
- >
- {`
+ >{`
- `}
-
+ `}
- {`
+ >{`
- `}
-
+ `}
- {`
+ >{`
- `}
-
+ `}
-## Formatting
+## Text input
+
+Use a text input when the expected user input is a single line of text. Text
+inputs have a fixed height and are used to enter simple free-form data entries
+with any combination of letters, numbers, or symbols. There are two styles of
+text input, default and fluid, which share the same functionality but look
+visually different. The context of how or where the component is used will
+dictate which style to use.
+
+| Style | Purpose |
+| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Default | Default is the most commonly used text input style with the label and helper text outside the field. Use when white space is needed between input components or in productive moments where space is at a premium, and smaller components are needed. |
+| Fluid | Fluid is an alternate styling for text input used in more expressive moments. Use in fluid forms, contained spaces, or attached to complex components, like a toolbar. Fluid components always sit flush with components around them. |
### Anatomy
-![Text input anatomy](images/text-input-usage-anatomy.png)
+
+
+
+
+![Anatomy of a text input in the default style](images/text-input-usage-anatomy-fixed.png)
+
+
+
+
+
+![Anatomy of a text input in the fluid style](images/text-input-usage-anatomy-fluid.png)
+
+
+
+
@@ -171,20 +200,16 @@ longer, multi-line entries.
1. **Label**: Text that informs the user about the content they need to enter in
the field. It is required unless you get an approved accessibility exemption.
2. **Value**: The content the user has entered into the field.
-3. **Helper text** (optional): Assistive text that can provide additional aid or
- context to the user. Often used to explain the correct data format.
-4. **Field**: The container in which a user enters data. Must meet 3:1 non-text
+3. **Field**: The container in which a user enters data. Must meet 3:1 non-text
contrast requirements.
-5. **Input requirement** (optional): This label indicates if the field is
- optional or required for the user to complete.
-6. **Character counter** (text area only): Indicate the number of characters
- being entered and the total number of characters allowed.
-7. **Resize handle** (text area only): Allows a user to manipulate the field
- height by making it longer or shorter.
+4. **Helper text** (optional): Assistive text that can provide additional aid or
+ context to the user. Often used to explain the correct data format. It is
+ positioned below the field in the default style and surfaced through a
+ tooltip in the fluid style.
### Sizing
-#### Text input heights
+#### Default input heights
There are three text input height sizes: small, medium, and large. Supporting
three sizes gives you more flexibility in structuring layouts. Be sure to use a
@@ -199,26 +224,120 @@ consistent field height when pairing form components on the same page.
-![Text input heights](images/text-input-usage-size.png)
+![Default text input heights](images/text-input-usage-size.png)
-#### Text area height
+#### Fluid input heights
+
+There is only one fluid input height and it is visually larger than the default
+heights. The input is a set height expect for when a warning or error message
+has been added to the bottom.
+
+
+
+
+![Fluid text input heights](images/text-input-usage-size-fluid.png)
+
+
+
+
+## Text area
+
+Use a text area when the expected user input is more than a few words and could
+span multiple lines. It is commonly used for features like user commentary or
+descriptions. It supports all the same states and functionality as text input
+except for the password functionality. Text area has several unique
+functionalities not included in the text input, like the resize handle and
+character counter.
+
+| Style | Purpose |
+| ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Default | Default is the most commonly used text area style with the label and helper text outside the field. Use when white space is needed between input components or in productive moments where space is at a premium, and smaller components are needed. |
+| Fluid | Fluid is an alternate styling for text area used in more expressive moments. Use in fluid forms, contained spaces, or attached to complex components, like a toolbar. Fluid components always sit flush with components around them. |
+
+### Anatomy
+
+
+
+
+
+
+
+
+![Anatomy of a text area in the default style](images/text-area-usage-anatomy-fixed.png)
+
+
+
+
+
+![Anatomy of a text area in the fluid style](images/text-area-usage-anatomy-fluid.png)
+
+
+
+
+
+
+
+
+1. **Label**: Text that informs the user about the content they need to enter in
+ the field. It is required unless you get an approved accessibility exemption.
+2. **Value**: The content the user has entered into the field.
+3. **Field**: The container in which a user enters data. Must meet 3:1 non-text
+ contrast requirements.
+4. **Resize hanle**: Allows a user to manipulate the field height by making it
+ longer or shorter.
+5. **Optional versus required indicator** (optional): This label indicates if
+ the field is optional or required for the user to complete.
+6. **Character counter** (optional): Indicate the number of characters being
+ entered and the total number of characters allowed.
+
+### Sizing
Text area has a variable height that can be lengthened or shortened by the user
-using the `resize` handle in the bottom right of the field. By default, text
-area has a minimum height of 40px/2.5rem but no maximum height.
+using the resize handle in the bottom right of the field. By default, text area
+has a minimum height of 40px/2.5rem but no maximum height.
+
+#### Resize handle
+
+Included by default in both default and fluid text area is the resize handle. It
+allows a user to manipulate the field height by making it longer or shorter. The
+resize handle has no effect on the width of the text area container, it only
+effects the height. If the user makes the field size shorter than the content
+inside the field then a vertical scroll will become available.
-
+
-![Text input heights](images/text-area-usage-size.png)
+![Example showing the resize handle in text area](images/text-area-usage-resize.png)
-#### Widths
+## Formatting
+
+### Alignment
+
+Input labels should vertically align to the grid and with other type elements on
+the page. The alignment of the input container will differ based on the style of
+text input you are using. Default inputs are always flush to the columns and
+fluid inputs will hang into the gutters.
+
+
+
+
+![Do align field containers to the grid.](images/text-input-usage-4-do.png)
+
+
+
+
+![Do hang fluid field containers to the gutter.](images/text-input-usage-4-do-fluid.png)
+
+
+
+
+#### Placement
The field widths of both text input and text area should reflect the intended
length of the content while still aligning to the grid columns or mini unit
@@ -271,7 +390,6 @@ consult an accessibility expert before proceeding with a label-less design.
- Use sentence-style capitalization for all labels, except for product names and
proper nouns.
- Keep the label short and concise.
-- Labels should clearly state the requirement status.
- Do not use colons after label names.
#### Helper text
@@ -281,16 +399,15 @@ completing a field. It is often used to explain the correct data format.
- Use sentence-style capitalization, and in most cases, write the text as full
sentences with punctuation.
-- Helper text is an optional feature and can be used in place of a tooltip.
-- When used, helper text is always available when the input is focused and
- appears underneath the field. The exceptions are when an error or warning
- message replaces the helper text.
+- When used, helper text appears persistently underneath the field, except when
+ an error or warning message replaces it.
#### Placeholder text
Optional placeholder text provides hints or examples of what to enter.
-Placeholder text disappears after the user begins entering data into the input
-and should not contain crucial information.
+Placeholder text disappears after the user begins entering data into the input.
+As such, it should not be used as a replacement for a persistent label nor
+should it contain crucial information.
- Use sentence-style capitalization, and in most cases, write the text as a
direct statement without punctuation.
@@ -299,12 +416,6 @@ and should not contain crucial information.
- Placeholder text can be harmful to user interactions and should only be added
when necessary.
-#### Accessibility best practices
-
-- Labels must be announced to the screen reader on focus.
-- Ensure the helper text that appears under an input is read when an assistive
- technology user stops at an input using ARIA.
-
### Overflow content
#### Overflow in a text input
@@ -346,7 +457,21 @@ sections below.
-![Text input states](images/text-input-states.png)
+
+
+
+
+![Text input states in the default style](images/text-input-usage-states-fixed.png)
+
+
+
+
+
+![Text input states in the fluid style](images/text-input-usage-states-fluid.png)
+
+
+
+
@@ -372,14 +497,7 @@ red border, an error icon indicator, and an error message.
-### Default values
-
-Where possible, add programmatic assistance. Detect and pre-fill inputs to
-reduce errors and save time. When the software can’t determine the value that
-belongs in an input, use type-ahead to make suggestions. Use sentence-case for
-default values, detected values, and auto-completion text.
-
-### Required vs. optional
+### Required versus optional
Text inputs can be labeled as either optional or required depending on the
depending on the circumstance. For more guidance on requirement labeling, see
@@ -410,12 +528,26 @@ caption="If the majority of the fields are optional, mark only the required fiel
Users can activate a text input by clicking on the field container. A separate
click is required to activate any additional actions associated with the text
-input such as a tooltip or password visibility toggle.
+input such as a password visibility toggle.
-![Example showing click target areas for text input](images/text-input-usage-mouse.png)
+
+
+
+
+![Example showing click target areas for text input in the default style](images/text-input-usage-mouse-fixed.png)
+
+
+
+
+
+![Example showing click target areas for text input in the fluid style](images/text-input-usage-mouse-fluid.png)
+
+
+
+
@@ -433,19 +565,7 @@ For additional keyboard interactions, see the
| _ctrl_ or _opt_ + _left/right arrows_ | Moves you word by word inside the field. |
| _ctrl_ or _opt_ + _up/down arrows_ | Relocates you to the start or end of the input content. |
-## Text input
-
-Use a text input when the expected user input is a single line of text. Text
-inputs have a fixed height and are used as a simple free-form data entry. Users
-can enter any combination of letters, numbers, or symbols.
-
-
-
-
-![Example of text input in context](images/text-input-usage-1.png)
-
-
-
+## Modifiers
### Password input
@@ -464,39 +584,6 @@ characters allowed or date structure.
-## Text area
-
-Use a text area when the expected user input is more than a few words and could
-span multiple lines. It is commonly used for features like user commentary or
-descriptions. It supports all the same states and functionality as text input
-except for the password functionality. Text area has several unique
-functionalities not included in the default text input, like the resize handle
-and character counter.
-
-
-
-
-![Example of a text area](images/text-input-usage-2.png)
-
-
-
-
-### Resize handle
-
-Included by default in text area is the `resize` handle. It allows a user to
-manipulate the field height by making it longer or shorter. The resize handle
-has no effect on the width of the text area container, it only effects the
-height. If the user makes the field size shorter than the content inside the
-field then a vertical scroll will become available.
-
-
-
-
-![Example showing the resize handle in text area](images/text-area-usage-resize.png)
-
-
-
-
### Character counter
A character counter can be added to text area to indicate both the number of
@@ -513,11 +600,9 @@ has been met.
-## References
+## Related
-- Katie Sherwin,
- [Placeholders in Form Fields Are Harmful](https://www.nngroup.com/articles/form-design-placeholders/)
- (Nielsen Norman Group, 2018)
+- [Form pattern](/patterns/forms-pattern/)
## Feedback
diff --git a/src/pages/components/tooltip/images/tooltip-accessibility-1.png b/src/pages/components/tooltip/images/tooltip-accessibility-1.png
new file mode 100644
index 00000000000..6ea0e0bb6ab
Binary files /dev/null and b/src/pages/components/tooltip/images/tooltip-accessibility-1.png differ
diff --git a/src/pages/components/tooltip/images/tooltip-accessibility-2.png b/src/pages/components/tooltip/images/tooltip-accessibility-2.png
new file mode 100644
index 00000000000..b9564c3ffcf
Binary files /dev/null and b/src/pages/components/tooltip/images/tooltip-accessibility-2.png differ
diff --git a/src/pages/components/tooltip/images/tooltip-accessibility-3-do.png b/src/pages/components/tooltip/images/tooltip-accessibility-3-do.png
new file mode 100644
index 00000000000..b72b1636081
Binary files /dev/null and b/src/pages/components/tooltip/images/tooltip-accessibility-3-do.png differ
diff --git a/src/pages/components/tooltip/images/tooltip-accessibility-3-dont.png b/src/pages/components/tooltip/images/tooltip-accessibility-3-dont.png
new file mode 100644
index 00000000000..e5713fe8211
Binary files /dev/null and b/src/pages/components/tooltip/images/tooltip-accessibility-3-dont.png differ
diff --git a/src/pages/components/tree-view/code.mdx b/src/pages/components/tree-view/code.mdx
index 96a2d0fccda..42cd79a7028 100755
--- a/src/pages/components/tree-view/code.mdx
+++ b/src/pages/components/tree-view/code.mdx
@@ -30,9 +30,265 @@ usage documentation, see the Storybooks for each framework below.
## Live demo
-
+import { Document, Folder } from '@carbon/icons-react';
-**Coming soon:** The live demo for tree view is underdevelopment and will be
-available soon.
-
-
+
+
+ {`
+
+ `}
+
+
## Formatting
diff --git a/src/pages/contributing/component/index.mdx b/src/pages/contributing/component/index.mdx
index 4732e5196c1..733a4eaf482 100644
--- a/src/pages/contributing/component/index.mdx
+++ b/src/pages/contributing/component/index.mdx
@@ -684,24 +684,14 @@ tokens will live in the style tab.
#### 5. Working code
The component or enhancement must be built in one of our supported frameworks
-(React, Web Components, Vue, or Angular). See the contribution guidelines for
-the specific repo you intend to contribute to.
+(Vanilla, React, Vue, or Angular). See the contribution guidelines for the
+specific repo you intend to contribute to.
-
-
-
-
-
-
-
diff --git a/src/pages/developing/frameworks/react.mdx b/src/pages/developing/frameworks/react.mdx
index 5df6a600aa9..844947224d3 100755
--- a/src/pages/developing/frameworks/react.mdx
+++ b/src/pages/developing/frameworks/react.mdx
@@ -59,29 +59,10 @@ behavior in prototype and production work.
## Install
-
-
-**`@carbon/react` is new for v11.** It houses all the components, styles, and
-icons within a single package. It replaces the need for `carbon-components`,
-`carbon-components-react`, `carbon-icons`, and `@carbon/icons-react` packages.
-
-It also includes the bulk of everything you should need from other Carbon
-packages including `@carbon/styles`, `@carbon/grid`, `@carbon/layout`,
-`@carbon/themes`, `@carbon/type`, etc.
-
-We recommend starting with `@carbon/react` and not installing other Carbon
-packages until you find it necessary.
-
-Full details are available in the [migration guide](/migrating/guide/develop)
-and the
-[v11 changelog](https://github.com/carbon-design-system/carbon/blob/main/docs/migration/v11.md).
-
-
-
Using npm:
```bash
-npm install @carbon/react --save
+npm install --save @carbon/react
```
@@ -95,63 +76,20 @@ yarn add @carbon/react
## Getting started
1. These components require the use of
- [webpack](https://webpack.js.org/guides/getting-started/), or a similar
- module bundler such as Vite, in your project.
-
-2. Components do not import any of the styles themselves. Styles are provided
- through `@carbon/react` as
- [Sass modules](https://sass-lang.com/blog/the-module-system-is-launched).
- You will likely need to install the
- [Dart Sass](https://npmjs.com/package/sass) package.
-
-```bash
-npm install sass --save-dev
-
-// or via yarn:
-yarn add sass --dev
-```
+ [webpack](https://webpack.js.org/guides/getting-started/) in your project.
+ See our
+ [webpack.config.js](https://github.com/carbon-design-system/carbon/blob/v10/packages/react/.storybook/webpack.config.js)
+ for an example configuration.
-3. Once `sass` is added and configured, `@use` the SCSS to bring in styling
- within an `index.scss`.
+2. Components do not import any of the styles themselves, use the SCSS or CSS
+ from `carbon-components` to bring in styling. You can also use the `unpkg`
+ CDN to bring in the styles wholesale -
+ `unpkg.com/carbon-components/css/carbon-components.css` aliases the latest
+ CSS file.
-```scss path=./index.scss
-@use '@carbon/react';
-```
-
-4. In most cases you'll need to import this file within the root file of your
- app
-
-```jsx path=./main.jsx
-import './index.scss';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-
-ReactDOM.render(
-
-
- ,
- document.getElementById('root')
-);
-```
-
-4. Import components and begin building!
-
-```jsx path=./App.jsx
-import { Button } from '@carbon/react';
-import React from 'react';
-
-function App() {
- return (
-
-
-
- );
-}
-
-export default App;
-```
+3. For older browsers (e.g. IE11), polyfills listed in the
+ [@carbon/react/.storybook/polyfills.js file](https://github.com/carbon-design-system/carbon/blob/main/packages/react/.storybook/polyfills.js)
+ are required.
## Development
@@ -181,12 +119,13 @@ yarn storybook
### List of available components
View available React Components [here](http://react.carbondesignsystem.com).
-Usage information is available when you select "Docs".
+Usage information is available when you click the blue "Show Info" button in the
+top right corner of the selected component.
## Troubleshooting
-If you experience any issues while getting set up with `@carbon/react`, please
-head over to the
+If you experience any issues while getting set up with Carbon Components React,
+please head over to the
[GitHub repo](https://github.com/carbon-design-system/carbon/tree/v10/packages/react)
for more guidelines and support. Please
[create an issue](https://github.com/carbon-design-system/carbon/issues) if your
diff --git a/src/pages/guidelines/motion/overview.mdx b/src/pages/guidelines/motion/overview.mdx
index cc1c372998a..cad64f1f3c7 100644
--- a/src/pages/guidelines/motion/overview.mdx
+++ b/src/pages/guidelines/motion/overview.mdx
@@ -82,11 +82,12 @@ user’s attention and offer a rhythmic break to the productive experience.
### Productive motion
-Productive motion creates a sense of efficiency and responsiveness, while remain
-subtle and out of the way. Productive motion is appropriate for moments when the
-user needs to focus on completing tasks. Microinteractions in Carbon such as
-button states, dropdowns, revealing additional information, or rendering data
-tables and visualizations were all designed with productive motion.
+Productive motion creates a sense of efficiency and responsiveness, while
+remaining subtle and out of the way. Productive motion is appropriate for
+moments when the user needs to focus on completing tasks. Microinteractions in
+Carbon such as button states, dropdowns, revealing additional information, or
+rendering data tables and visualizations were all designed with productive
+motion.
### Expressive motion
diff --git a/src/pages/migrating/guide/develop.mdx b/src/pages/migrating/guide/develop.mdx
index 7ba15682235..107390e7e95 100644
--- a/src/pages/migrating/guide/develop.mdx
+++ b/src/pages/migrating/guide/develop.mdx
@@ -233,7 +233,7 @@ longer necessary.
This step can be automated using the `@carbon/upgrade` CLI. For full details,
- see the `@carbon/upgrade` [package
+ see the [`@carbon/upgrade` package
documentation](https://github.com/carbon-design-system/carbon/tree/main/packages/upgrade)
@@ -252,7 +252,7 @@ import { Accordion, AccordionItem } from '@carbon/react';
This step can be automated using the `@carbon/upgrade` CLI. For full details,
- see the `@carbon/upgrade` [package
+ see the [`@carbon/upgrade` package
documentation](https://github.com/carbon-design-system/carbon/tree/main/packages/upgrade)
diff --git a/src/pages/patterns/fluid-styles/images/Layout_overview_Fluid-base-unit.svg b/src/pages/patterns/fluid-styles/images/Layout_overview_Fluid-base-unit.svg
new file mode 100644
index 00000000000..ad64fcf85c2
--- /dev/null
+++ b/src/pages/patterns/fluid-styles/images/Layout_overview_Fluid-base-unit.svg
@@ -0,0 +1,211 @@
+
+
\ No newline at end of file
diff --git a/src/pages/patterns/fluid-styles/images/fluid-pattern-button-2.png b/src/pages/patterns/fluid-styles/images/fluid-pattern-button-2.png
new file mode 100644
index 00000000000..a78c1fc9dba
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/fluid-pattern-button-2.png differ
diff --git a/src/pages/patterns/fluid-styles/images/fluid-pattern-buttons.png b/src/pages/patterns/fluid-styles/images/fluid-pattern-buttons.png
new file mode 100644
index 00000000000..f854b0c2aed
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/fluid-pattern-buttons.png differ
diff --git a/src/pages/patterns/fluid-styles/images/fluid-pattern-form.png b/src/pages/patterns/fluid-styles/images/fluid-pattern-form.png
new file mode 100644
index 00000000000..fa7186a087c
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/fluid-pattern-form.png differ
diff --git a/src/pages/patterns/fluid-styles/images/fluid-pattern-inputs-1.png b/src/pages/patterns/fluid-styles/images/fluid-pattern-inputs-1.png
new file mode 100644
index 00000000000..348cef7b252
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/fluid-pattern-inputs-1.png differ
diff --git a/src/pages/patterns/fluid-styles/images/fluid-pattern-inputs-2.png b/src/pages/patterns/fluid-styles/images/fluid-pattern-inputs-2.png
new file mode 100644
index 00000000000..438bf58edd3
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/fluid-pattern-inputs-2.png differ
diff --git a/src/pages/patterns/fluid-styles/images/fluid-pattern-overview.png b/src/pages/patterns/fluid-styles/images/fluid-pattern-overview.png
new file mode 100644
index 00000000000..cba1f67ca88
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/fluid-pattern-overview.png differ
diff --git a/src/pages/patterns/fluid-styles/images/fluid-pattern-placement.png b/src/pages/patterns/fluid-styles/images/fluid-pattern-placement.png
new file mode 100644
index 00000000000..1956329bb20
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/fluid-pattern-placement.png differ
diff --git a/src/pages/patterns/fluid-styles/images/form-usage-4-do.png b/src/pages/patterns/fluid-styles/images/form-usage-4-do.png
new file mode 100644
index 00000000000..0f156f6e7c6
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/form-usage-4-do.png differ
diff --git a/src/pages/patterns/fluid-styles/images/form-usage-4-dont.png b/src/pages/patterns/fluid-styles/images/form-usage-4-dont.png
new file mode 100644
index 00000000000..cbd8fb46b7c
Binary files /dev/null and b/src/pages/patterns/fluid-styles/images/form-usage-4-dont.png differ
diff --git a/src/pages/patterns/fluid-styles/index.mdx b/src/pages/patterns/fluid-styles/index.mdx
new file mode 100644
index 00000000000..81f085c6d7b
--- /dev/null
+++ b/src/pages/patterns/fluid-styles/index.mdx
@@ -0,0 +1,295 @@
+---
+title: Fluid styles
+description:
+ Fluid versions of certain familiar components offer alternative stylistic
+ expressions that differentiate them from their default counterparts.
+---
+
+
+
+Fluid versions of certain familiar components offer alternative stylistic
+expressions that differentiate them from their default counterparts. The
+juxtaposition of both fluid and default styling in a user interface manifests
+the expressive and productive duality that is the cornerstone of the IBM brand.
+
+
+
+
+ Overview
+ Types of fluid components
+ Designing with fluid
+ Related
+ Feedback
+
+
+## Overview
+
+When we say that a component is “fluid,” we mean that it becomes a part of a
+larger, compound component by bleeding to one or more edges of its container.
+Fluid components never exist in isolation; they are always part of another
+component or structure, like a modal or form. Fluid is a unique style and
+particular expression of a component. Alternatively, the more common expression,
+frequently used in productive spaces, is known as the default style.
+
+Default and fluid components share the same functionality but look visually
+different and have different alignment rules. The fluid name originates from how
+these components respond and where they can be placed. Fluid components always
+hug at least one container edge, moving along with the grid as the container
+resizes.
+
+
+
+
+![Example of fluid](/images/fluid-pattern-overview.png)
+
+
+
+
+
+ A fluid text input and fluid buttons inside a fluid modal container using the
+ condensed grid mode.
+
+
+### Key terms
+
+| Term | Definition |
+| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Fixed width | The width of an element is set to a specific value and does not change as the browser resizes. |
+| Fluid width | The width of an element is responsive, often proportionally changing between breakpoints or is set as a percentage of a container. |
+| Default style | The primary style and behavior of a component that may respond either in a fluid or fixed-width manner depending on layout and responsive strategy. Default styling is more productive in nature and is most commonly used across product UI. |
+| Fluid style | An alternative style and behavior available for certain components that always has a fluid width. Fluid components are percentage-based as they comprise part of a greater whole. Fluid styling is more expressive and is used to create drama and emphasis in an experience. |
+| Productive moment | Experiences that keep the user focused and able to complete complex tasks. Productive elements may appear more conservative, confident, and efficient on the whole. |
+| Expressive moment | Experiences that create a desired impact or pause in a layout. Expressive elements are often employed in long-form, editorial experiences, when users are learning and exploring. Expressive elements may evoke more personality and emotion. |
+
+### When to use fluid styles
+
+- Use in expressive or important moments, to better capture the user’s attention
+ and offer a rhythmic break to the productive experience.
+- Use within or attached to compound components.
+- Use in spacious layouts where the fluid variants have space to expand and
+ breathe.
+
+### When not to use fluid styles
+
+- Don’t use when white space is needed between input components or in dense
+ layouts where smaller components may be preferred.
+- Don’t use in hyper-productive moments like a complex form.
+- Don’t use inside accordions or similarly sectioned containers, where the edge
+ of the fluid component aligns to the same edge as the accordion dividers; this
+ creates hierarchical confusion.
+
+## Types of fluid components
+
+Not all components come with a fluid style, but each fluid instance has a
+default counterpart. The most common types components that have a fluid style
+are inputs, buttons, containers, and forms.
+
+### Fluid inputs
+
+Fluid inputs are an alternative input style with the label placed inside the
+input field, aligning with the user input text. All text is contained inside the
+field, unlike the default input, where the label and helper text sit above and
+below (respectively) outside the field container. Fluid inputs only have one
+height, at 64px, but have a fluid width that hugs one or more edges of its
+container. See the individual input components for more guidance on each fluid
+option.
+
+
+
+
+![Examples of fluid components](/images/fluid-pattern-inputs-1.png)
+
+
+
+
+### Fluid buttons
+
+Button alignment determines whether the button is a default or fluid element
+within a layout. If it is fluid, its width is defined as a percentage (25%, 50%,
+or 100%) of the container’s width and will often be attached to the bottom of
+the container. Fluid buttons can never be embedded in the middle of a
+flow/layout. They must hug at least on edge of a container. Use default buttons
+if additional options or actions follow below the primary flow and primary
+action. For more guidance on default versus fluid buttons, see the
+[button component](/components/button/usage/#alignment).
+
+
+
+
+![Layout examples of fluid buttons](/images/fluid-pattern-buttons.png)
+
+
+
+
+#### Fluid-width default buttons
+
+A default button can have a fixed or fluid width. A fixed-width button is set to
+the size of the text label with 64px fixed padding on the right side and 16px
+fixed padding on the left. However, there is a hybrid scenario where a floating
+default-style button can span a designated number of columns on the responsive
+column grid, giving it a fluid width. These are called "fluid-width default
+buttons."
+
+Fluid-width default buttons are always preferable to fixed-width default buttons
+in a layout. When possible set the default button container’s relative position
+to the responsive layout grid and match button width to the width of other
+elements on the page. Ideally, when using groups of related buttons (not
+including ghost buttons), they should all be the same width.
+
+
+
+
+![Example of a hybrid fluid button](/images/fluid-pattern-button-2.png)
+
+
+
+
+### Fluid containers
+
+Though not a formal component, fluid and fixed containers are applied in various
+existing components. Fluid containers, like a modal, calculate their width based
+on column spans or percentages and will fluctuate in size. Fixed containers,
+like a side panel, maintain a static width, cannot be collapsed and can exist
+outside the responsive grid. For more information on grid responsive containers,
+see [2x Grid](/guidelines/2x-grid/overview/).
+
+
+
+
+![Example of fixed and fluid](/images/Layout_overview_Fluid-base-unit.svg)
+
+
+
+
+### Fluid forms
+
+Fluid forms are architectural in that they do not allow vertical or horizontal
+space between inputs. Fluid forms use the condensed or narrow grid mode and can
+hang into the gutter without causing label misalignment. Default forms use a
+wide grid mode and align, flush to the grid columns, prioritizing vertical label
+alignment on the grid.
+
+Fluid forms should only be used for simple, straightforward tasks, and any
+complex or multi-section forms should use the default style instead. For more
+guidance on default versus fluid forms, see the
+[form component](/components/form/usage/).
+
+
+
+
+![Example of a fluid and default form](/images/fluid-pattern-form.png)
+
+
+
+
+
+ An example showing grid alignment for a fluid form (top) and the default form
+ (bottom).
+
+
+## Designing with fluid
+
+### Visual guidance
+
+#### Alignment
+
+- Fluid components are stacked flush to one another with 0px of padding between
+ them.
+- Default components are equally stacked with padding separating each component.
+- Fluid components use the condensed or narrow grid modes while default variants
+ use the wide or narrow grid mode.
+
+
+
+
+![An example showing a properly stacked fluid inputs](images/form-usage-4-do.png)
+
+
+
+
+![An example showing incorrectly arranged fluid inputs](images/form-usage-4-dont.png)
+
+
+
+
+#### Placement
+
+- Fluid components will always bleed to one or more edges of their container.
+- Fluid components never exist in isolation; they are always part of another
+ component or structure.
+
+
+
+
+![Examples of various ways a fluid component may be attached to its container](/images/fluid-pattern-placement.png)
+
+
+
+
+
+ Examples of various ways a fluid component may be attached to its container.
+
+
+#### Sizing
+
+- Fluid component width is dependent on its fluid container size or column span.
+ Fluid components can change per breakpoint or according to their defined
+ percentage.
+- Default components may have fluid widths to a certain point but will commonly
+ have a max or min width to prevent them from continuously growing.
+
+#### Accessibility
+
+- Fluid components need a 3:1 border between them when vertically or
+ horizontally stacked.
+
+### Best practices
+
+- Fluid components always appear in a container or as a structural unit. Default
+ components may or may not appear within a container and margins will vary
+ according to their location on the grid.
+- Together, fluid components comprise fluid containers, whereas default
+ components can either sit on the page, without a container, or inside a
+ container in with inner margins.
+- Default and fluid components can be used together in certain hybrid scenarios.
+ The most common pairing is default input components, with fluid buttons in a
+ contained form, like a modal or side panel.
+
+## Related
+
+
+
+
+#### Components
+
+- [Button](/components/button/usage)
+- [Date picker](/components/date-picker/usage/)
+- [Dropdown](/components/dropdown/usage/)
+- [Form](/components/form/usage/)
+- [Number input](/components/number-input/usage/)
+- [Search](/components/search/usage/)
+- [Select](/components/select/usage/)
+- [Text input](/components/text-input/usage/)
+
+
+
+
+#### Patterns
+
+- [Forms](/patterns/forms-pattern/)
+- [Login](/patterns/login-pattern/)
+
+#### Guidelines
+
+- [2x Grid](/guidelines/2x-grid/overview/)
+- [Motion](/guidelines/motion/overview/)
+- [Typography](/guidelines/typography/style-strategies)
+
+
+
+
+## Feedback
+
+Help us improve this pattern by providing feedback, asking questions, and
+leaving any other comments on
+[GitHub](https://github.com/carbon-design-system/carbon-website/issues/new?assignees=&labels=feedback&template=feedback.md).
diff --git a/src/pages/patterns/login-pattern/index.mdx b/src/pages/patterns/login-pattern/index.mdx
index f4aa4a44074..77bc1a20ac2 100644
--- a/src/pages/patterns/login-pattern/index.mdx
+++ b/src/pages/patterns/login-pattern/index.mdx
@@ -142,15 +142,15 @@ in the future.
If distinguishing between the authentication methods in the background is not
technically feasible, provide users buttons to the various paths upfront.
-Consult your product team's guidance to determine which alternative logins your
+Consult your product team’s guidance to determine which alternative logins your
platform or product offers.
-Fixed text inputs and buttons should be used for this design so that the primary
-button can maintain its position next to the input field. See the
-[Fluid vs. fixed inputs](#fluid-vs.-fixed-components) section below for more
-specific usage guidance. Also, please refer to brand guidelines when using logos
-for alternative logins. Examples of brand guidelines for a few commonly used
-alternative logins include:
+Default text inputs and buttons should be used for this design so that the
+primary button can maintain its position next to the input field. See the
+[Fluid vs. default style inputs](#fluid-vs.-default-components) section below
+for more specific usage guidance. Also, please refer to brand guidelines when
+using logos for alternative logins. Examples of brand guidelines for a few
+commonly used alternative logins include:
- [Azure brand guidelines](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-add-branding-in-azure-ad-apps)
- [Github brand guidelines](https://github.com/logos)
@@ -207,7 +207,7 @@ Common client-side errors:
-Whether you are using fixed or fluid text inputs in your login flow, inline
+Whether you are using default or fluid text inputs in your login flow, inline
error messages should be displayed below any required field that is empty once
the field loses focus or an action button (“Continue” or “Log in”) is clicked.
See the fluid text input specs for more information on error states. Once the
@@ -256,30 +256,27 @@ The following error messages are suggested:
## Design and layout
-### Fluid vs. fixed components
+### Fluid vs. default components
-Although the fluid inputs have not been added as a variant to Carbon core
-components yet, they have complete
-[design specs](https://github.com/carbon-design-system/carbon/issues/5416) and
-are currently under development. Since many product teams have expressed
-interest in using the fluid inputs for Login and Sign up flows, the Carbon team
-wanted to consolidate exploration and present a clear path forward. What we have
-presented above is the ideal future state of the login pattern.
+Many product teams have expressed a preference for using the fluid inputs for
+Login and Sign up flows. What we have presented above is the ideal state of the
+login pattern using the fluid styles.
-However, since a coded variant does not exist for fluid inputs, many teams may
-choose to proceed with the fixed inputs. Below are several alternate examples
-illustrating the login flow with fixed inputs.
+However, teams may choose to proceed with the default style inputs. Below are
+several alternate examples illustrating the login flow with default inputs.
-Fluid buttons and inputs require floating containers, whereas fixed buttons and
-inputs can either sit on the page, without a container, or sit in a side-aligned
-full bleed container (much like a panel).
+Fluid buttons and inputs require floating containers, whereas default buttons
+and inputs can either sit on the page, without a container, or sit in a
+side-aligned full bleed container (much like a panel).
-![Example of a log in flow using fixed text input components](./images/6_Login_alternates_fixed_1120.png)
+![Example of a log in flow using the default text input components](./images/6_Login_alternates_fixed_1120.png)
-
Example of a log in flow using fixed text input components
+
+ Example of a log in flow using the default style text input components
+
@@ -289,8 +286,8 @@ full bleed container (much like a panel).
As mentioned above, we prefer that the system distinguishes the path a user
needs to take in the background rather than making them choose in the UI.
However, with certain products, that’s not an option. In order to present
-multiple alternate logins to the user up front, designers must use fixed text
-inputs and fixed buttons so that the primary button can remain close to the
+multiple alternate logins to the user up front, designers must use default text
+inputs and default buttons so that the primary button can remain close to the
input field.
Be mindful of the hierarchy and avoid layouts that emphasize alternate logins
@@ -332,7 +329,7 @@ caption="Do not put alternate login buttons at the top of the login form.">
Carbon provides best practice advice on the login pattern but will leave more
specific design guidance to the product teams. For instance, decisions like
where to position the login flow on a page (i.e. left, right, or center), or
-whether to use fluid or fixed inputs, can be made at the product team level as
+whether to use fluid or default inputs, can be made at the product team level as
long as the fields remain on the grid. Designers can also choose whether to
incorporate brand-approved background textures, illustrations and/or marketing
content. Visit the [IBM Brand Center](https://www.ibm.com/brand/) for specific
@@ -418,17 +415,14 @@ Since login forms can appear as the central focus of the screen or in
conjunction with marketing content in a split-screen layout, margins and
vertical spacing can vary according to context.
-#### Fluid login form
+#### Fluid style login form
The fluid login form has consistent margins regardless of its width on the grid
-or whether it uses fluid or fixed inputs. When the password input appears in
+or whether it uses fluid or default inputs. When the password input appears in
place of the username input, all of the spatial relationships remain the same,
even though certain options (for example, “Remember ID” and alternate logins)
disappear. This prevents an awkward resizing or jumping during the animation.
-Even if your team chooses not to incorporate the “Remember ID” piece, please do
-not adjust the spacing of the fluid login form, just remove it.
-
@@ -445,19 +439,19 @@ not adjust the spacing of the fluid login form, just remove it.
-![Specs for margins and vertical spacing in a centered login form with fixed input](./images/14_Login_centered_fixed_specs_736.png)
+![Specs for margins and vertical spacing in a centered login form with a default styled input](./images/14_Login_centered_fixed_specs_736.png)
- Specs for margins and vertical spacing in a centered login form with fixed
- input
+ Specs for margins and vertical spacing in a centered login form with a default
+ styled input
-#### Fixed login form
+#### Default style login form
-The fixed login form may or may not appear within a container and margins will
+The default login form may or may not appear within a container and margins will
vary according to its location on the grid. Adhere to the vertical spacing in
the specs below regardless of the container.
@@ -467,11 +461,11 @@ remove the 24px margin top along with it, to adjust the spacing.
-![Specs for margins and vertical spacing in a split-screen login form with fixed input](./images/15_Login_centered_fixed_form_specs_736.png)
+![Specs for margins and vertical spacing in a split-screen login form with a default input](./images/15_Login_centered_fixed_form_specs_736.png)
- Specs for margins and vertical spacing in a split-screen login form with fixed
- input
+ Specs for margins and vertical spacing in a split-screen login form with a
+ default style input
diff --git a/src/pages/patterns/read-only-states-pattern/index.mdx b/src/pages/patterns/read-only-states-pattern/index.mdx
index 55381e78bc0..e177f925c49 100644
--- a/src/pages/patterns/read-only-states-pattern/index.mdx
+++ b/src/pages/patterns/read-only-states-pattern/index.mdx
@@ -139,18 +139,11 @@ icons, and visualizations) should remain the same as the component’s enabled
state. Below are a few examples of components comparing their read-only and
enabled states.
-
-
-**Note:** Some of the following examples show fluid components that are coming
-soon but are currently unavailable for production use.
-
-
-
#### Component fields
-Fixed component field background colors blend in with the overall UI or layer
-background for read-only states, whereas fluid component field backgrounds
-retain the same enabled state background color.
+The default style component field background colors blend in with the overall UI
+or layer background for read-only states, whereas fluid component field
+backgrounds retain the same enabled state background color.
@@ -159,13 +152,13 @@ retain the same enabled state background color.
-![Read-only state for fixed and fluid component text field backgrounds.](images/read-only-component-fields.png)
+![Read-only state for default and fluid component text field backgrounds.](images/read-only-component-fields.png)
-![Enabled state for fixed and fluid component text field backgrounds.](images/read-only-component-fields-enabled.png)
+![Enabled state for default and fluid component text field backgrounds.](images/read-only-component-fields-enabled.png)
@@ -214,13 +207,13 @@ token.
-![Read-only state for fixed and fluid time picker icon signifiers.](images/read-only-component-icon-signifiers.png)
+![Read-only state for default and fluid time picker icon signifiers.](images/read-only-component-icon-signifiers.png)
-![Enabled state for fixed and fluid time picker icon signifiers.](images/read-only-component-icon-signifiers-enabled.png)
+![Enabled state for default and fluid time picker icon signifiers.](images/read-only-component-icon-signifiers-enabled.png)
diff --git a/yarn.lock b/yarn.lock
index ad5737f42bb..88177e145f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1295,19 +1295,19 @@
"@carbon/telemetry" "0.1.0"
prop-types "^15.7.2"
-"@carbon/pictograms-react@^11.38.0":
- version "11.38.0"
- resolved "https://registry.yarnpkg.com/@carbon/pictograms-react/-/pictograms-react-11.38.0.tgz#78c8d7f51f5b9a102662f2f4a1d2dc3833830431"
- integrity sha512-bd3yYMpHJiZDIAjN8T0dLOmd0S5Zetc642DQM1yXwNUxT39mbDC58XR9qbeEVPP1ylhQr0Gce086iEoLv7gA3w==
+"@carbon/pictograms-react@^11.39.0":
+ version "11.39.0"
+ resolved "https://registry.yarnpkg.com/@carbon/pictograms-react/-/pictograms-react-11.39.0.tgz#eadb763852803cc0fa2c125a4b84136a2b413d8f"
+ integrity sha512-EIfPePXyRtdWX3zt1sRGTkWuRefZ9te1YmYrBkIpjIHN+2E04TqWrALEv0CqRX1NGUcm8DvN4W8G2znPhUIi2Q==
dependencies:
"@carbon/icon-helpers" "^10.38.0"
"@carbon/telemetry" "0.1.0"
prop-types "^15.7.2"
-"@carbon/pictograms@^12.12.0":
- version "12.12.0"
- resolved "https://registry.yarnpkg.com/@carbon/pictograms/-/pictograms-12.12.0.tgz#f7809871f50eb7332b6a10dee41987538f6af03f"
- integrity sha512-gy8CLOo74T4W3UPUwp3aMHkId5Ji5J/lROFGqiYWcibu4AGsnEbnG7Rd20Q2vJTXX8v15YzLnLZNUTsdziz1lg==
+"@carbon/pictograms@^12.13.0":
+ version "12.13.0"
+ resolved "https://registry.yarnpkg.com/@carbon/pictograms/-/pictograms-12.13.0.tgz#b1cfa7b700bbc2a8288cd9da660d8eea8b5e8d4c"
+ integrity sha512-qAiXxZn/QNfb6xN41TNcbWe5AB1VbXP8e7czkTqUrkHujkyDKcJBcpUlRL6R+ftki41HYoXosokQlr7PE43iUw==
"@carbon/react@^1.11.0":
version "1.14.0"
@@ -1336,16 +1336,16 @@
wicg-inert "^3.1.1"
window-or-global "^1.0.1"
-"@carbon/react@^1.22.0":
- version "1.22.0"
- resolved "https://registry.yarnpkg.com/@carbon/react/-/react-1.22.0.tgz#9aec21d9a8fa7c886331d25d2ecf51be64d65bd5"
- integrity sha512-Igt6utOBhOL6Ux3Xhskqkx+COoGU3TJYnuyQoaXs9fIy78lphS3pwVVqhhOlz50yRMNVd+BlVnFRZUU4rpWNxg==
+"@carbon/react@^1.23.0":
+ version "1.23.0"
+ resolved "https://registry.yarnpkg.com/@carbon/react/-/react-1.23.0.tgz#1f62cb852c581f63a9649f620ba74b621c77a144"
+ integrity sha512-S3AkWdR3zD+1GZFOKxn0YnJZjlCjKYr3Ndtfi+zfnqBhTIiDtwQxsQMG3J5ZcLsiNgtb3y7xxxreQk87MiNFpg==
dependencies:
"@babel/runtime" "^7.18.3"
"@carbon/feature-flags" "^0.12.0"
"@carbon/icons-react" "^11.16.0"
"@carbon/layout" "^11.11.0"
- "@carbon/styles" "^1.22.0"
+ "@carbon/styles" "^1.23.0"
"@carbon/telemetry" "0.1.0"
classnames "2.3.2"
copy-to-clipboard "^3.3.1"
@@ -1377,10 +1377,10 @@
"@carbon/type" "^11.10.0"
"@ibm/plex" "6.0.0-next.6"
-"@carbon/styles@^1.22.0":
- version "1.22.0"
- resolved "https://registry.yarnpkg.com/@carbon/styles/-/styles-1.22.0.tgz#5527bc4e05dce3fca985540711c9c182c7a025ae"
- integrity sha512-lfewhEFIaRDhnwGhknen+vzhgfgd/3nq1nk6JZWP9FqwwkJR02UiWrl7Mr40chyzxzuYmtAv/nJh2m7qJelhiw==
+"@carbon/styles@^1.23.0":
+ version "1.23.0"
+ resolved "https://registry.yarnpkg.com/@carbon/styles/-/styles-1.23.0.tgz#2774c53026b15d88bfb1d9b9ff7d8a497fe1b3e5"
+ integrity sha512-t806EWLGcQuJz2baCtWygyLGtFH9mHRA30AdBVTVNd+yUDyBuU9wChJ5OdFNZkUbhiFw1Sj/Dap6I+zruLfkDw==
dependencies:
"@carbon/colors" "^11.12.0"
"@carbon/feature-flags" "^0.12.0"