Skip to content

Commit 4aafdff

Browse files
tay1orjonestay1orjones
authored
revert errant commit and revert (carbon-design-system#4188)
* Revert "Revert "fix: fixed merge"" This reverts commit c05809f. * Revert "fix: fixed merge" This reverts commit 06fd9ad, reversing changes made to 3518e87.
1 parent c05809f commit 4aafdff

File tree

330 files changed

+5997
-1847
lines changed

Some content is hidden

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

330 files changed

+5997
-1847
lines changed

‎.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Default to system one design and one dev
22

3-
* @carbon-design-system/developers-system @carbon-design-system/design
3+
* @carbon-design-system/developers-system-reviewers @carbon-design-system/design
44

55
# Diana Tran is the owner for Sustainability Software Patterns
66

77
src/pages/community/patterns/login-pattern/* @dianatran18 @lukefirth
88

99
# Eliad Moosavi and Natasha Decoste are the code owners for Data Visualization
1010

11-
src/pages/data-visualization/* @theiliad @natashadecoste
11+
src/pages/data-visualization/* @theiliad # @natashadecoste
1212

1313
# Zvonimir Fras for Angular tutorial
1414

1515
/src/pages/tutorial/angular/* @zvonimirfras
1616

1717
# Lee Chase for Vue tutorial
1818

19-
/src/pages/tutorial/vue/* @lee-chase
19+
/src/pages/tutorial/vue/* @lee-chase

‎.github/ISSUE_TEMPLATE/docs-issue.yaml

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
name: Documentation issue 📖
2+
description:
3+
Report missing, incorrect, or otherwise inconsistent documentation here.
4+
title: '[Docs]: '
5+
labels: 'type: bug 🐛'
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: '## Welcome!'
10+
- type: markdown
11+
attributes:
12+
value:
13+
Thanks for taking the time to fill out this form that will help us make
14+
more clear documention.
15+
16+
- type: dropdown
17+
id: project
18+
attributes:
19+
label: Project
20+
description: Where is the problem you're identifying in the documentation?
21+
multiple: false
22+
options:
23+
- https://www.carbondesignsystem.com
24+
- https://react.carbondesignsystem.com
25+
- https://github.com/carbon-design-system/carbon/tree/main/docs
26+
validations:
27+
required: true
28+
29+
- type: input
30+
id: section
31+
attributes:
32+
label: Section
33+
description:
34+
'Which page are you experiencing the problem with the documentation?'
35+
placeholder: https://carbondesignsystem.com/components/accordion/usage/
36+
validations:
37+
required: true
38+
39+
- type: textarea
40+
id: problem
41+
attributes:
42+
label: Problem
43+
description:
44+
'Describe the problem you’re experiencing in the documentation. Please
45+
attach any screen shots or videos to illustrate the problem.'
46+
placeholder:
47+
The abc component is missing usage instructions about the xyz prop.
48+
validations:
49+
required: true
50+
51+
- type: textarea
52+
id: solution
53+
attributes:
54+
label: Solution
55+
description:
56+
'What would you expect to see instead? Please attach any screen shots or
57+
videos to illustrate a possible solution.'
58+
placeholder: _Your amazing idea here_
59+
60+
- type: dropdown
61+
id: severity
62+
attributes:
63+
label: Suggested Severity
64+
description:
65+
'Read more to understand our [severity
66+
levels](https://github.com/carbon-design-system/carbon/blob/main/docs/guides/support.md#severity)'
67+
options:
68+
- 'Severity 1 = The documentation damages the brand or exposes
69+
intellectual property.'
70+
- 'Severity 2 = The documentation is wrong or missing major details. It
71+
conflicts with what we are saying in another part of the system. '
72+
- "Severity 3 = The documentation is mis-leading, somewhat true, missing
73+
minor details, or grammatically incorrect. It doesn't present
74+
conflicts with other parts of the design system."
75+
- 'Severity 4 = Unrelated to a user task. Content has a typo.'
76+
77+
- type: input
78+
id: application
79+
attributes:
80+
label: Application
81+
description: 'What application do you work on?'
82+
83+
- type: checkboxes
84+
id: terms
85+
attributes:
86+
label: Code of Conduct
87+
description: Please confirm the following
88+
options:
89+
- label:
90+
I agree to follow this project's [Code of
91+
Conduct](https://github.com/carbon-design-system/carbon/blob/f555616971a03fd454c0f4daea184adf41fff05b/.github/CODE_OF_CONDUCT.md)
92+
required: true
93+
- label:
94+
I checked the [current
95+
issues](https://github.com/carbon-design-system/carbon/issues) for
96+
duplicate problems

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,6 @@ build-timestamp
113113

114114
.now
115115
.vercel
116+
117+
# Yarn install state
118+
.yarn/install-state.gz

‎.yarn/install-state.gz

-2.49 MB
Binary file not shown.

‎api/survey.ts

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
"dependencies": {
4040
"@babel/core": "^7.15.8",
4141
"@carbon/charts-react": "0.55.0",
42-
"@carbon/elements": "^11.40.0",
43-
"@carbon/icons": "^11.36.0",
44-
"@carbon/icons-react": "^11.36.0",
45-
"@carbon/pictograms": "^12.31.0",
46-
"@carbon/pictograms-react": "^11.57.0",
47-
"@carbon/react": "^1.51.0",
42+
"@carbon/elements": "^11.49.0",
43+
"@carbon/icons": "^11.45.0",
44+
"@carbon/icons-react": "^11.45.0",
45+
"@carbon/pictograms": "^12.37.1",
46+
"@carbon/pictograms-react": "^11.63.1",
47+
"@carbon/react": "^1.61.0",
4848
"@loadable/component": "^5.15.2",
4949
"@slack/web-api": "^5.11.0",
5050
"babel-preset-env": "^1.7.0",
@@ -57,7 +57,7 @@
5757
"gatsby": "^4.25.7",
5858
"gatsby-image": "^3.7.1",
5959
"gatsby-plugin-image": "^2.9.0",
60-
"gatsby-theme-carbon": "^3.4.13",
60+
"gatsby-theme-carbon": "^3.4.19",
6161
"lodash-es": "^4.17.15",
6262
"markdown-it": "^12.3.2",
6363
"nanoid": "^2.1.11",

‎src/components/A11yStatus/A11yStatus.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
help,
2525
hidden,
2626
moreLink,
27-
table,
2827
variant,
2928
version,
3029
headingLink,
@@ -397,10 +396,7 @@ const A11yStatus = ({ components, layout }) => {
397396
<strong>Framework:</strong> React (@carbon/react)
398397
</p>
399398
<Row>
400-
<Column
401-
colLg={12}
402-
noGutterSm
403-
className={`${table} page-table__container`}>
399+
<Column colLg={12} noGutterSm className="page-table__container">
404400
<table className="page-table">
405401
<thead>
406402
<tr>

‎src/components/A11yStatusTag/A11yStatusTag.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ const A11yStatusTag = ({ tag, tooltip }) => {
4343

4444
const { color, text, definition } = tags[tag];
4545

46-
return (
46+
return tooltip ? (
47+
<DefinitionTooltip openOnHover definition={definition}>
48+
<Tag type={color} className={styles.tag}>
49+
{text}
50+
</Tag>
51+
</DefinitionTooltip>
52+
) : (
4753
<Tag type={color} className={styles.tag}>
48-
{tooltip ? (
49-
<DefinitionTooltip openOnHover definition={definition}>
50-
{text}
51-
</DefinitionTooltip>
52-
) : (
53-
text
54-
)}
54+
{text}
5555
</Tag>
5656
);
5757
};

‎src/components/A11yStatusTag/a11y-status-tag.module.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
:global(.page-table) .tag {
22
margin-left: 0;
33
}
4+
5+
:global(.cds--popover-container .cds--definition-term) {
6+
border: none;
7+
}
8+
9+
:global(.cds--popover-container .cds--definition-term) .tag span {
10+
border-block-end: 1px dotted $border-strong;
11+
cursor: pointer;
12+
}

‎src/components/ColorTokenTable/ColorTokenTable.js

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,75 @@ export default class ColorTokenTable extends React.Component {
435435
</tbody>
436436
</table>
437437
</div>
438+
<div className="cds--col-lg-7">
439+
<h3 className="page-h3">AI</h3>
440+
</div>
441+
<div className="cds--col-lg-12 cds--no-gutter">
442+
<table className="page-table">
443+
<thead>
444+
<tr>
445+
<th>Token</th>
446+
<th>Role</th>
447+
<th>Value</th>
448+
</tr>
449+
</thead>
450+
<tbody>
451+
{Object.keys(colorTokens['ai']).map((token, i) =>
452+
this.renderToken(
453+
token,
454+
colorTokens['ai'][token],
455+
i
456+
)
457+
)}
458+
</tbody>
459+
</table>
460+
</div>
461+
<div className="cds--col-lg-7">
462+
<h3 className="page-h3">Chat</h3>
463+
</div>
464+
<div className="cds--col-lg-12 cds--no-gutter">
465+
<table className="page-table">
466+
<thead>
467+
<tr>
468+
<th>Token</th>
469+
<th>Role</th>
470+
<th>Value</th>
471+
</tr>
472+
</thead>
473+
<tbody>
474+
{Object.keys(colorTokens['chat']).map((token, i) =>
475+
this.renderToken(
476+
token,
477+
colorTokens['chat'][token],
478+
i
479+
)
480+
)}
481+
</tbody>
482+
</table>
483+
</div>
484+
<div className="cds--col-lg-7">
485+
<h3 className="page-h3">Chat button</h3>
486+
</div>
487+
<div className="cds--col-lg-12 cds--no-gutter">
488+
<table className="page-table">
489+
<thead>
490+
<tr>
491+
<th>Token</th>
492+
<th>Role</th>
493+
<th>Value</th>
494+
</tr>
495+
</thead>
496+
<tbody>
497+
{Object.keys(colorTokens['chat-button']).map((token, i) =>
498+
this.renderToken(
499+
token,
500+
colorTokens['chat-button'][token],
501+
i
502+
)
503+
)}
504+
</tbody>
505+
</table>
506+
</div>
438507
</section>
439508
</div>
440509
);

0 commit comments

Comments
 (0)