Skip to content

Commit 9480a74

Browse files
Merge branch 'main' into design-guidelines
2 parents 6e0d7fe + b0d7991 commit 9480a74

47 files changed

Lines changed: 1955 additions & 88 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
},
3131
"devDependencies": {
3232
"@octokit/rest": "^19.0.7",
33-
"@patternfly/patternfly": "^6.2.0",
34-
"@patternfly/react-code-editor": "^6.2.0",
35-
"@patternfly/react-core": "^6.2.0",
36-
"@patternfly/react-table": "^6.2.0",
33+
"@patternfly/patternfly": "^6.2.3",
34+
"@patternfly/react-code-editor": "^6.2.2",
35+
"@patternfly/react-core": "^6.2.2",
36+
"@patternfly/react-table": "^6.2.2",
3737
"glob": "^8.1.0",
3838
"lerna": "^6.4.1",
3939
"react": "^18",

packages/ast-helpers/CHANGELOG.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,57 @@
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+
# 1.4.0-alpha.182 (2025-04-24)
7+
8+
**Note:** Version bump only for package @patternfly/ast-helpers
9+
10+
11+
12+
13+
14+
# 1.4.0-alpha.181 (2025-04-24)
15+
16+
**Note:** Version bump only for package @patternfly/ast-helpers
17+
18+
19+
20+
21+
22+
# 1.4.0-alpha.180 (2025-04-23)
23+
24+
**Note:** Version bump only for package @patternfly/ast-helpers
25+
26+
27+
28+
29+
30+
# 1.4.0-alpha.179 (2025-04-23)
31+
32+
**Note:** Version bump only for package @patternfly/ast-helpers
33+
34+
35+
36+
37+
38+
# 1.4.0-alpha.178 (2025-04-23)
39+
40+
**Note:** Version bump only for package @patternfly/ast-helpers
41+
42+
43+
44+
45+
46+
# 1.4.0-alpha.177 (2025-04-23)
47+
48+
49+
### Bug Fixes
50+
51+
* **example:** keeps example content from overflowing content area ([#4550](https://github.com/patternfly/patternfly-org/issues/4550)) ([8a4b648](https://github.com/patternfly/patternfly-org/commit/8a4b648a46aa710608557ce920e8070bf251d5ef))
52+
53+
54+
55+
56+
657
# 1.4.0-alpha.176 (2025-04-16)
758

859
**Note:** Version bump only for package @patternfly/ast-helpers

packages/ast-helpers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@patternfly/ast-helpers",
33
"description": "Acorn AST helpers for working with live code",
4-
"version": "1.4.0-alpha.176",
4+
"version": "1.4.0-alpha.182",
55
"author": "Red Hat",
66
"license": "MIT",
77
"publishConfig": {

packages/documentation-framework/CHANGELOG.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,57 @@
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+
## 6.9.9 (2025-04-24)
7+
8+
**Note:** Version bump only for package @patternfly/documentation-framework
9+
10+
11+
12+
13+
14+
## 6.9.8 (2025-04-24)
15+
16+
**Note:** Version bump only for package @patternfly/documentation-framework
17+
18+
19+
20+
21+
22+
## 6.9.7 (2025-04-23)
23+
24+
**Note:** Version bump only for package @patternfly/documentation-framework
25+
26+
27+
28+
29+
30+
## 6.9.6 (2025-04-23)
31+
32+
**Note:** Version bump only for package @patternfly/documentation-framework
33+
34+
35+
36+
37+
38+
## 6.9.5 (2025-04-23)
39+
40+
**Note:** Version bump only for package @patternfly/documentation-framework
41+
42+
43+
44+
45+
46+
## 6.9.4 (2025-04-23)
47+
48+
49+
### Bug Fixes
50+
51+
* **example:** keeps example content from overflowing content area ([#4550](https://github.com/patternfly/patternfly-org/issues/4550)) ([8a4b648](https://github.com/patternfly/patternfly-org/commit/8a4b648a46aa710608557ce920e8070bf251d5ef))
52+
53+
54+
55+
56+
657
## 6.9.3 (2025-04-16)
758

859
**Note:** Version bump only for package @patternfly/documentation-framework

packages/documentation-framework/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@patternfly/documentation-framework",
33
"description": "A framework to build documentation for PatternFly.",
4-
"version": "6.9.3",
4+
"version": "6.9.9",
55
"author": "Red Hat",
66
"license": "MIT",
77
"bin": {
@@ -12,7 +12,7 @@
1212
"@babel/preset-env": "^7.24.3",
1313
"@babel/preset-react": "^7.24.1",
1414
"@mdx-js/util": "1.6.16",
15-
"@patternfly/ast-helpers": "^1.4.0-alpha.176",
15+
"@patternfly/ast-helpers": "^1.4.0-alpha.182",
1616
"@reach/router": "npm:@gatsbyjs/reach-router@1.3.9",
1717
"autoprefixer": "9.8.6",
1818
"babel-loader": "^9.1.3",
@@ -72,11 +72,11 @@
7272
"webpack-merge": "5.8.0"
7373
},
7474
"peerDependencies": {
75-
"@patternfly/patternfly": "^6.2.0",
76-
"@patternfly/react-code-editor": "^6.2.0",
77-
"@patternfly/react-core": "^6.2.0",
78-
"@patternfly/react-table": "^6.2.0",
79-
"react": "^17.0.0 || ^18.0.0",
80-
"react-dom": "^17.0.0 || ^18.0.0"
75+
"@patternfly/patternfly": "^6.2.3",
76+
"@patternfly/react-code-editor": "^6.2.2",
77+
"@patternfly/react-core": "^6.2.2",
78+
"@patternfly/react-table": "^6.2.2",
79+
"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
80+
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
8181
}
8282
}

packages/documentation-framework/templates/mdx.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ p.pf-v6-c-content--p.ws-p {
2323
.ws-back-to-top {
2424
z-index: var(--pf-t--global--z-index--2xl);
2525
}
26+
27+
.ws-example-page-wrapper {
28+
max-width: min(100%, 825px);
29+
}

packages/documentation-framework/templates/mdx.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const MDXChildTemplate = ({ Component, source, toc = [], index = 0, id }) => {
110110
const ChildComponent = () => (
111111
<div className={source !== 'landing-pages' ? 'pf-v6-l-flex' : ''}>
112112
{toc.length > 1 && <TableOfContents items={toc} />}
113-
<Stack hasGutter style={{ ...(source !== 'landing-pages' && { maxWidth: '825px' }) }}>
113+
<Stack hasGutter className={(source !== 'landing-pages' && 'ws-example-page-wrapper')}>
114114
{InlineAlerts}
115115
<Component />
116116
{functionDocumentation.length > 0 && (

packages/documentation-framework/versions.json

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,36 @@
11
{
22
"Releases": [
3+
{
4+
"name": "6.2.1",
5+
"date": "2025-04-21",
6+
"latest": true,
7+
"versions": {
8+
"@patternfly/patternfly": "6.2.3",
9+
"@patternfly/react-catalog-view-extension": "6.1.0",
10+
"@patternfly/react-charts": "8.2.2",
11+
"@patternfly/react-code-editor": "6.2.2",
12+
"@patternfly/react-component-groups": "6.2.1",
13+
"@patternfly/react-core": "6.2.2",
14+
"@patternfly/react-drag-drop": "6.2.2",
15+
"@patternfly/react-icons": "6.2.2",
16+
"@patternfly/react-log-viewer": "6.1.0",
17+
"@patternfly/react-styles": "6.2.2",
18+
"@patternfly/react-table": "6.2.2",
19+
"@patternfly/react-tokens": "6.2.2",
20+
"@patternfly/react-topology": "6.2.0",
21+
"@patternfly/react-user-feedback": "6.1.0",
22+
"@patternfly/react-console": "6.0.0",
23+
"@patternfly/quickstarts": "6.2.2",
24+
"@patternfly/react-virtualized-extension": "6.0.0",
25+
"@patternfly/react-templates": "6.2.2",
26+
"@patternfly/chatbot": "2.2.1",
27+
"@patternfly/data-view": "6.2.0"
28+
}
29+
},
330
{
431
"name": "6.2.0",
532
"date": "2024-12-17",
6-
"latest": true,
33+
"hidden": true,
734
"versions": {
835
"@patternfly/patternfly": "6.2.0",
936
"@patternfly/react-catalog-view-extension": "6.1.0",

packages/documentation-site/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"@patternfly/chatbot": "2.2.1",
2121
"@patternfly/design-tokens": "1.13.2",
2222
"@patternfly/documentation-framework": "workspace:*",
23-
"@patternfly/quickstarts": "6.2.0",
23+
"@patternfly/quickstarts": "6.2.2",
2424
"@patternfly/react-catalog-view-extension": "6.1.0",
25-
"@patternfly/react-component-groups": "6.2.0",
25+
"@patternfly/react-component-groups": "6.2.1",
2626
"@patternfly/react-console": "6.0.0",
2727
"@patternfly/react-data-view": "6.1.0",
2828
"@patternfly/react-docs": "7.2.0",

packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/breadcrumb.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ id: Breadcrumb
33
section: components
44
---
55

6+
import '../components.css';
7+
68
## Usage
79

8-
<img src="./img/breadcrumb.png" alt="Example of breadcrumbs" width="990"/>
10+
<div class="ws-docs-content-img">
11+
![Breadcrumbs show under the masthead.](./img/breadcrumbs-usage.svg)
12+
</div>
913

1014
Use breadcrumbs in addition to your global navigation to display a user's location in the application.
1115

@@ -15,9 +19,11 @@ Use breadcrumbs in addition to your global navigation to display a user's locati
1519
* Breadcrumbs in PatternFly are intended to show the location of a page in the site hierarchy, and are **not intended to map the user's path through the application**.
1620

1721
## Placement
18-
Breadcrumbs should be placed underneath the masthead, at the top of the page. There should be 16px of padding both between the breadcrumb and the masthead, and between the breadcrumbs and anything that comes below.
22+
Breadcrumbs should be placed underneath the masthead, at the top of the page. There should be `--pf-t--global--spacer--md` (16px) of padding both between the breadcrumb and the masthead, and between the breadcrumbs and anything that comes below.
1923

20-
<img src="./img/placement.png" alt="Placement of breadcrumbs and padding" width="825"/>
24+
<div class="ws-docs-content-img">
25+
![Breadcrumbs shown underneath the masthead and at the top of the page above the page content.](./img/breadcrumbs-placement.svg)
26+
</div>
2127

2228
## Accessibility
2329
For information regarding accessibility, visit the [breadcrumb accessibility](/components/breadcrumb/accessibility) tab.

0 commit comments

Comments
 (0)