Skip to content

Commit 7fd93d7

Browse files
authored
Merge pull request #696 from puppetlabs/rebrand
Rebrand
2 parents 6134978 + 8af1c83 commit 7fd93d7

39 files changed

Lines changed: 324 additions & 246 deletions

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## data-grid 0.7.0 (2025-04-24)
2+
3+
- Rebranding updates. (by [@sean-mckenna](https://github.com/sean-mckenna) and [@koosolek](https://github.com/koosolek) and [@Jo-Lillie](https://github.com/Jo-Lillie) in [#696](https://github.com/puppetlabs/design-system/pull/696))
4+
5+
## react-layouts 2.0.0-alpha.13 (2025-04-23)
6+
7+
- Rebranding updates. (by [@sean-mckenna](https://github.com/sean-mckenna) and [@koosolek](https://github.com/koosolek) and [@Jo-Lillie](https://github.com/Jo-Lillie) in [#696](https://github.com/puppetlabs/design-system/pull/696))
8+
9+
## react-components 5.35.0 (2025-04-23)
10+
11+
- Rebranding updates. (by [@sean-mckenna](https://github.com/sean-mckenna) and [@koosolek](https://github.com/koosolek) and [@Jo-Lillie](https://github.com/Jo-Lillie) in [#696](https://github.com/puppetlabs/design-system/pull/696))
12+
113
## sass-variables 1.5.0 (2025-04-24)
214

315
- Rebranding updates. (by [@sean-mckenna](https://github.com/sean-mckenna) and [@koosolek](https://github.com/koosolek) and [@Jo-Lillie](https://github.com/Jo-Lillie)

packages/data-grid/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/data-grid/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@puppet/data-grid",
3-
"version": "0.6.14",
3+
"version": "0.7.0",
44
"author": "Puppet, Inc.",
55
"license": "Apache-2.0",
66
"main": "dist/index.js",
@@ -27,8 +27,8 @@
2727
"react-dom": "^16.13.0 || ^17.0.0 || ^18.0.0"
2828
},
2929
"dependencies": {
30-
"@puppet/react-components": "^5.34.10",
31-
"@puppet/sass-variables": "^1.4.4",
30+
"@puppet/react-components": "^5.35.0",
31+
"@puppet/sass-variables": "^1.5.0",
3232
"classnames": "^2.5.1",
3333
"init": "^0.1.2",
3434
"lodash": "^4.17.21",

packages/data-grid/src/table/Table.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919

2020
.dg-column-header-sortable:hover {
21-
color: $puppet-b400;
21+
color: $Brand__Foreground__Link__Hover;
2222
}
2323

2424
.dg-column-header-sortable:focus {
@@ -34,15 +34,15 @@
3434
.dg-column-header-sortable:active {
3535
border: 0;
3636
box-shadow: $puppet-common-focus-outline-inset;
37-
color: $puppet-b600;
37+
color: $Brand__Foreground__Link__Pressed;
3838

3939
&::before {
4040
width: 0;
4141
}
4242
}
4343

4444
.dg-column-header-label-active {
45-
color: $puppet-b500;
45+
color: $Brand__Foreground__Link__Rest;
4646
}
4747

4848
.dg-column-header-icon-container {
@@ -52,13 +52,13 @@
5252
.dg-column-header-icon-color {
5353
&.asc {
5454
.rc-icon-increment-up {
55-
fill: $puppet-b500;
55+
fill: $Brand__Foreground__Link__Rest;
5656
}
5757
}
5858

5959
&.desc {
6060
.rc-icon-increment-down {
61-
fill: $puppet-b500;
61+
fill: $Brand__Foreground__Link__Rest;
6262
}
6363
}
6464
}
@@ -87,7 +87,7 @@
8787
}
8888

8989
.dg-table-row-selected {
90-
background-color: $puppet-b50;
90+
background-color: $Neutral__Background__2__Rest;
9191

9292
.rc-table-cell::before {
9393
width: 0;

packages/design-system-website/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@babel/preset-env": "^7.11.0",
1818
"@babel/preset-react": "^7.10.4",
1919
"@babel/register": "^7.10.5",
20-
"@puppet/sass-variables": "^1.4.3",
20+
"@puppet/sass-variables": "^1.5.0",
2121
"@webpack-cli/configtest": "^2.1.1",
2222
"@webpack-cli/info": "^2.0.2",
2323
"@webpack-cli/serve": "^2.0.5",
@@ -59,8 +59,8 @@
5959
"dependencies": {
6060
"@popperjs/core": "^2.9.2",
6161
"@puppet/data-grid": "^0.2.7",
62-
"@puppet/react-components": "^5.34.10",
63-
"@puppet/react-layouts": "^2.0.0-alpha.4",
62+
"@puppet/react-components": "^5.35.0",
63+
"@puppet/react-layouts": "^2.0.0-alpha.13",
6464
"brace": "^0.11.1",
6565
"prop-types": "^15.7.2",
6666
"react": "^16.13.1",

packages/design-system-website/styleguideComponents/StyleGuideRenderer.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ export function StyleGuideRenderer({ children, toc, hasSidebar }) {
1919
{hasSidebar && (
2020
<Sidebar>
2121
<Sidebar.Header
22-
logo="Design System"
22+
logo="puppet-general-new"
23+
ariaLabel="Return to the home page"
2324
as="a"
24-
href="#/Puppet%20Design%20System"
25+
href="/"
2526
/>
2627
{toc}
2728
</Sidebar>

packages/design-system-website/styleguideComponents/TableOfContentsRenderer.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export function TableOfContentsRenderer({
2222
<Input
2323
name="filter"
2424
className="pds-filter"
25-
simple
2625
icon="search"
2726
placeholder="Search"
2827
value={searchTerm}
Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
@import '~@puppet/sass-variables/index';
22

33
.pds-filter {
4-
margin-bottom: 4 * $puppet-common-spacing-base;
5-
6-
.rc-input {
7-
background-color: $puppet-n950;
8-
border-color: $puppet-n950;
9-
border-radius: 4px;
10-
box-sizing: border-box;
11-
color: $puppet-n400;
12-
height: 32px;
13-
}
14-
15-
.rc-input:hover {
16-
border-color: $puppet-n900;
17-
}
4+
margin-bottom: 2 * $puppet-common-spacing-base;
5+
margin-top: 2 * $puppet-common-spacing-base;
186
}

packages/react-components/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/react-components/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@puppet/react-components",
3-
"version": "5.34.11",
3+
"version": "5.35.0",
44
"author": "Puppet, Inc.",
55
"license": "Apache-2.0",
66
"main": "build/library.js",
@@ -11,7 +11,7 @@
1111
"prepare": "npm run build",
1212
"complexity": "es6-plato -r -d complexity source/react && open ./complexity/index.html",
1313
"watch": "nodemon --watch source -x \"npm run build\"",
14-
"test": "nyc --require=./test/jsdom.js --reporter=html mocha --require @babel/register --require core-js --require regenerator-runtime/runtime --recursive --exit",
14+
"test": "nyc --reporter=html mocha --require @babel/register --require core-js --require regenerator-runtime/runtime --require=./test/jsdom.js --recursive --exit",
1515
"lint": "npm run js-lint && npm run scss-lint",
1616
"js-lint": "eslint --quiet 'source/react/**/*.js'",
1717
"scss-lint": "stylelint 'source/scss/**/*.scss'",
@@ -73,7 +73,7 @@
7373
},
7474
"dependencies": {
7575
"@popperjs/core": "^2.11.8",
76-
"@puppet/sass-variables": "^1.4.4",
76+
"@puppet/sass-variables": "^1.5.0",
7777
"classnames": "^2.5.1",
7878
"core-js": "^3.38.1",
7979
"hoist-non-react-statics": "^3.3.2",

0 commit comments

Comments
 (0)