Skip to content
This repository was archived by the owner on Apr 5, 2022. It is now read-only.

Commit ae9a036

Browse files
committed
Merge branch 'master' into box-v2
2 parents 36693a6 + 9f22828 commit ae9a036

25 files changed

Lines changed: 460 additions & 351 deletions

File tree

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
- Box: rename spacing props values from "default" to "medium".
77
- Box: update Box docs.
88

9+
# 7.1.3
10+
- Update to CONTRIBUTING.md about installing lerna.
11+
- BlankSlate: Remove hard-coded / default icon graphic and white background Panel per UX.
12+
- Form: Remove 24px margin between fields per UX.
13+
- Modal: Remove header and footer boarder lines, push top down, add left & right padding of 25px, include a -md class which is not quite as wide as the default. All per UX.
14+
- DataTable: Change the thickness and color of the header row bottom border, remove the extra DataTable.css import which was causing issues, added alignment argument to header props. All per UX.
15+
- TopNav: Fixed some sizing and cursor issues.
16+
- Panel: Now passing down classnames onto the component.
17+
918
# 7.1.2
1019

1120
## New Component

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ For components from visual-stack that require state management, this library pro
2626
This is a microsite providing documentation and live examples of components. This package depends on the other two.
2727

2828
### Running locally
29+
Install lerna: `npm install -g lerna`
30+
31+
Make sure you are using node 14 or below (`npm install -g n` can be helpful here)
2932

3033
From a fresh clone of the repo, start by bootstrapping the project from the root with `npm run bootstrap`. This will install all external dependencies, create links between local dependent packages and build all three packages.
3134

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "7.1.2",
5+
"version": "7.1.4",
66
"lerna": "2.9.0"
77
}

packages/visual-stack-docs/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/visual-stack-docs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cjdev/visual-stack-docs",
3-
"version": "7.1.2",
3+
"version": "7.1.4",
44
"private": true,
55
"devDependencies": {
66
"concurrently": "^4.1.0",
@@ -15,8 +15,8 @@
1515
"rimraf": "^2.6.3"
1616
},
1717
"dependencies": {
18-
"@cjdev/visual-stack": "^7.1.2",
19-
"@cjdev/visual-stack-redux": "^7.1.2",
18+
"@cjdev/visual-stack": "^7.1.3",
19+
"@cjdev/visual-stack-redux": "^7.1.4",
2020
"express": "^4.16.4",
2121
"luxon": "^1.13.2",
2222
"material-ui": "^1.0.0-beta.46",

packages/visual-stack-redux/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/visual-stack-redux/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cjdev/visual-stack-redux",
3-
"version": "7.1.2",
3+
"version": "7.1.4",
44
"main": "lib/index.js",
55
"files": [
66
"dist",
@@ -30,7 +30,7 @@
3030
]
3131
},
3232
"peerDependencies": {
33-
"@cjdev/visual-stack": "^4.0.0",
33+
"@cjdev/visual-stack": "^7.0.0",
3434
"react": ">=15.3.1",
3535
"react-dom": ">=15.3.1",
3636
"redux": ">=3.3.1"
@@ -46,7 +46,7 @@
4646
"@babel/preset-env": "^7.3.1",
4747
"@babel/preset-react": "^7.0.0",
4848
"@babel/register": "^7.0.0",
49-
"@cjdev/visual-stack": "^7.1.2",
49+
"@cjdev/visual-stack": "^7.1.3",
5050
"babel-eslint": "^10.0.1",
5151
"babel-jest": "^24.3.0",
5252
"babel-loader": "^8.0.5",

packages/visual-stack/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/visual-stack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cjdev/visual-stack",
3-
"version": "7.1.2",
3+
"version": "7.1.3",
44
"files": [
55
"dist",
66
"lib",

packages/visual-stack/src/components/BlankSlate/index.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,27 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { Button } from '../Button';
44
import './BlankSlate.css';
5-
import IconExample from 'mdi-react/BlurIcon';
6-
import { Panel } from '../../../lib/components/Panel';
75

86
export const BlankSlate = ({
97
children,
108
alignment = '',
119
title = 'You do not have any content.',
12-
headerGraphic = <IconExample />,
10+
headerGraphic = '',
1311
className = '',
1412
...restProps
1513
}) => {
1614
return (
17-
<Panel>
18-
<div
19-
{...restProps}
20-
className={`vs-bs-container ${alignment === 'left-side' &&
21-
'vs-bs-leftalign'} ${className}`}
22-
>
23-
<div className="vs-bs-img">{headerGraphic}</div>
24-
<div className="vs-bs-content">
25-
<h1 className="vs-bs-title">{title}</h1>
26-
{children}
27-
</div>
15+
<div
16+
{...restProps}
17+
className={`vs-bs-container ${alignment === 'left-side' &&
18+
'vs-bs-leftalign'} ${className}`}
19+
>
20+
<div className="vs-bs-img">{headerGraphic}</div>
21+
<div className="vs-bs-content">
22+
<h1 className="vs-bs-title">{title}</h1>
23+
{children}
2824
</div>
29-
</Panel>
25+
</div>
3026
);
3127
};
3228

0 commit comments

Comments
 (0)