Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Inline loading] Updated text size and states #4374

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/pages/components/inline-loading/style.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tabs: ['Usage', 'Style', 'Code', 'Accessibility']
<Row>
<Column colLg={8}>

![Example of inline loading states](images/inline-loading-states.png)
![Example of inline loading states](images/inline-loading-states-style.png)

</Column>
</Row>
Expand All @@ -33,9 +33,9 @@ tabs: ['Usage', 'Style', 'Code', 'Accessibility']
Text should be set in sentence case, with only the first word in a phrase and
any proper nouns capitalized.

| Element | Font-size (px/rem) | Font-weight | Type token |
| ------- | ------------------ | ------------- | ----------- |
| Text | 12 / 0.75 | Regular / 400 | `$label-01` |
| Element | Font-size (px/rem) | Font-weight | Type token |
| ------- | ------------------ | ------------- | ------------------ |
| Text | 14 / 0.75 | Regular / 400 | `$body-compact-01` |

## Structure

Expand Down
16 changes: 8 additions & 8 deletions src/pages/components/inline-loading/usage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ For further content guidance, see Carbon's

### States

There are four states to inline loading: inactive, active, success, and error.
There are four states to inline loading: inactive, active, finished, and error.

<Row>
<Column colLg={8}>
Expand All @@ -143,9 +143,9 @@ visual indicator.

The active loading state indicates that the action is still in progress.

#### Success
#### Finished

The success loading state indicates that the action completed successfully. The
The finished loading state indicates that the action completed successfully. The
success state is active for 1.5 seconds before calling an optional function
`onSuccess`. Use the `onSuccess` function to refetch new data, close a modal, or
reset a form. If no function is specified the success state will last
Expand All @@ -159,11 +159,11 @@ notification or error handling within the form should appear.

### Interactions

Any interactive elements associated with the item that is loading should be
disabled until the loading is complete. For example, in a file uploader the item
that is loading is disabled until fully uploaded. If the inline loading is being
used to submit a form, the form fields should be disabled until the loading is
complete.
Any interactive elements associated with the button should be disabled while it
is loading. For example, when a user clicks a button on a modal to submit
information, the button itself displays a loading state and is disabled until
the action is complete. This ensures users cannot interact with the button again
during the process.

<Row>
<Column colLg={8}>
Expand Down
Loading