Skip to content

Commit 115d1e0

Browse files
committed
Merge branch 'main' into kl-gm-1044
2 parents 1bc40df + 8657642 commit 115d1e0

File tree

8 files changed

+66
-14
lines changed

8 files changed

+66
-14
lines changed

packages/styleguide/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [73.0.6](https://github.com/Codecademy/gamut/compare/@codecademy/styleguide@73.0.5...@codecademy/styleguide@73.0.6) (2025-05-12)
7+
8+
**Note:** Version bump only for package @codecademy/styleguide
9+
610
### [73.0.5](https://github.com/Codecademy/gamut/compare/@codecademy/styleguide@73.0.4...@codecademy/styleguide@73.0.5) (2025-05-01)
711

812
### Bug Fixes

packages/styleguide/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@codecademy/styleguide",
33
"description": "Styleguide & Component library for codecademy.com",
4-
"version": "73.0.5",
4+
"version": "73.0.6",
55
"author": "Codecademy Engineering",
66
"license": "MIT",
77
"publishConfig": {

packages/styleguide/src/lib/Atoms/Badge/Badge.mdx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,14 @@ Use the tertiary-fill variant when a tertiary `Badge` needs to sit above other c
8888

8989
Use the accent variant to draw attention to important details or statuses with a noticeable but less dominant emphasis than the primary `Badge`.
9090

91-
<Callout text="The accent variant does not respond to ColorMode." />
91+
<Callout
92+
text={
93+
<>
94+
The accent variant does not respond to{' '}
95+
<LinkTo id="Foundations/ColorMode">ColorMode</LinkTo>.
96+
</>
97+
}
98+
/>
9299

93100
<Canvas of={BadgeStories.Accent} />
94101

packages/styleguide/src/lib/Atoms/InternalFloatingCard/InternalFloatingCard.mdx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,18 @@ export const parameters = {
2323

2424
<ComponentHeader {...parameters} />
2525

26-
<Callout text="The InternalFloatingCard component is strictly for internal Gamut usage. For instance, the Modal component will use InternalFloatingCard to style its content. However, InternalFloatingCard is no longer exported for use in other libraries, in such cases, use Card instead." />
26+
<Callout
27+
text={
28+
<>
29+
The InternalFloatingCard component is strictly for internal Gamut usage.
30+
For instance, the{' '}
31+
<LinkTo id="Molecules/Modals/Modal">Modal component</LinkTo> will use
32+
InternalFloatingCard to style its content. However, InternalFloatingCard
33+
is no longer exported for use in other libraries, in such cases, use{' '}
34+
<LinkTo id="Atoms/Card">Card</LinkTo> instead.
35+
</>
36+
}
37+
/>
2738

2839
## Usage
2940

packages/styleguide/src/lib/Meta/Contributing.mdx

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { Anchor } from '@codecademy/gamut';
12
import { Meta } from '@storybook/blocks';
23

34
import { AboutHeader, Callout, LinkTo } from '~styleguide/blocks';
@@ -77,7 +78,21 @@ All components must have Storybook stories showing their use. See <LinkTo id='Me
7778

7879
Please fill out the pull request template, including links to the corresponding Abstract design and JIRA ticket.
7980

80-
<Callout text="You can use a [Draft PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests) to just run CI jobs. That includes deploying a Netlify preview and publishing alpha package versions to npm. 😉" />
81+
<Callout
82+
text={
83+
<>
84+
You can use a{' '}
85+
<Anchor
86+
target="_"
87+
href="https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests"
88+
>
89+
Draft PR
90+
</Anchor>{' '}
91+
to just run CI jobs. That includes deploying a Netlify preview and
92+
publishing alpha package versions to npm. 😉
93+
</>
94+
}
95+
/>
8196

8297
### Publishing updates
8398

packages/styleguide/src/lib/Molecules/AccordionButtonDeprecated/AccordionButtonDeprecated.mdx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Canvas, Controls, Meta } from '@storybook/blocks';
22

3-
import { Callout, ComponentHeader } from '~styleguide/blocks';
3+
import { Callout, ComponentHeader, LinkTo } from '~styleguide/blocks';
44

55
import * as AccordionButtonDeprecatedStories from './AccordionButtonDeprecated.stories';
66

@@ -19,7 +19,14 @@ Comes in a few standard size and color combinations.`,
1919

2020
<ComponentHeader {...parameters} />
2121

22-
<Callout text="This component is deprecated. For similar functionality, consider using the Disclosure component." />
22+
<Callout
23+
text={
24+
<>
25+
Note: This component is deprecated. For similar functionality, consider
26+
using the <LinkTo id="Molecules/Disclosure">Disclosure</LinkTo> component.
27+
</>
28+
}
29+
/>
2330

2431
## Usage
2532

packages/styleguide/src/lib/Molecules/AccordionDeprecated/AccordionDeprecated.mdx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Canvas, Controls, Meta } from '@storybook/blocks';
22

3-
import { Callout, ComponentHeader } from '~styleguide/blocks';
3+
import { Callout, ComponentHeader, LinkTo } from '~styleguide/blocks';
44

55
import * as AccordionDeprecatedStories from './AccordionDeprecated.stories';
66

@@ -19,7 +19,15 @@ such as a "hint" section in the LE or a list of department jobs on a careers pag
1919

2020
<ComponentHeader {...parameters} />
2121

22-
<Callout text="Note: This component is deprecated. For similar functionality, consider using Disclosure or a List component." />
22+
<Callout
23+
text={
24+
<>
25+
Note: This component is deprecated. For similar functionality, consider
26+
using <LinkTo id="Molecules/Disclosure">Disclosure</LinkTo> or a{' '}
27+
<LinkTo id="Organisms/Lists & Tables/List">List </LinkTo> component.
28+
</>
29+
}
30+
/>
2331

2432
## Usage
2533

@@ -33,7 +41,7 @@ This Accordion component will fit to `100%` of the the height of their parent co
3341

3442
### When NOT to use:
3543

36-
- [Having a button that reveals additional information]- for creating a single "Accordion", similar to an HTML [details](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details) element, use the Disclosure component instead.
44+
- Having a button that reveals additional information- for creating a single "Accordion", similar to an HTML [details](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details) element, use the Disclosure component instead.
3745
- Creating a "Accordion" with many rows — akin to an FAQ that lists out questions and reveals an answer when clicked, use the List component with expandable rows.
3846

3947
## Variants

packages/styleguide/src/lib/Molecules/Disclosure/Disclosure.mdx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ export const parameters = {
2525

2626
## Usage
2727

28-
Use a Disclosure to progressively reveal information, giving users the option to access additional details as needed. By initially hiding less immediately relevant information, it minimizes cognitive load and boosts content scannability.
28+
Use a `Disclosure` to progressively reveal information, giving users the option to access additional details as needed. By initially hiding less immediately relevant information, it minimizes cognitive load and boosts content scannability.
2929

3030
### Best practices:
3131

32-
- When there is large amount of information that all users might not need to see, but some users might want to see, use a Disclosure to hint at the additional information and allow users to expand it.
32+
- When there is large amount of information that all users might not need to see, but some users might want to see, use a `Disclosure` to hint at the additional information and allow users to expand it.
3333

3434
### When NOT to use:
3535

36-
- If you need to use multiple Disclosures, use the <LinkTo id="Organisms/Lists & Tables/List">List</LinkTo> component component with `<ExpandableRowClick>` for the time being.
36+
- If you need to use multiple `Disclosure` components, use the <LinkTo id="Organisms/Lists & Tables/List">List</LinkTo> component component with `<ExpandableRowClick>` for the time being.
3737

3838
## Variants
3939

40-
Disclosure has 3 variants for background color (`'default'`, `'subtle', 'transparent'`), a state of `hasBorder` to render a 1px solid black border, and 3 spacing options (`'normal'`, `'condensed'`, `'compact'`). Check the Figma design to apply the correct styling.
40+
`Disclosure` has 3 variants for background color (`'default'`, `'subtle'`, `'transparent'`), a state of `hasBorder` to render a 1px solid black border, and 3 spacing options (`'normal'`, `'condensed'`, `'compact'`). Check the Figma design to apply the correct styling.
4141

4242
### Background and border variants
4343

@@ -48,7 +48,7 @@ Disclosure has 3 variants for background color (`'default'`, `'subtle', 'transpa
4848

4949
### Spacing options
5050

51-
`spacing` is an optional prop you can pass to `<Disclosure>`. By default it's set to `"normal"`, though you can set it to `"condensed"` or `"compact"` as well. Spacing will determine the height of the heading, the size of the chevron icon, as well as the padding of both the heading and the body.
51+
`spacing` is an optional prop you can pass to `Disclosure`. By default it's set to `"normal"`, though you can set it to `"condensed"` or `"compact"` as well. Spacing will determine the height of the heading, the size of the chevron icon, as well as the padding of both the heading and the body.
5252

5353
<Canvas of={DisclosureStories.Normal} />
5454
<Canvas of={DisclosureStories.Condensed} />

0 commit comments

Comments
 (0)