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

Commit beb33b9

Browse files
authored
Merge pull request #332 from cjdev/box-v2
Box v2
2 parents 9f22828 + ae9a036 commit beb33b9

50 files changed

Lines changed: 1278 additions & 1444 deletions

Some content is hidden

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

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
# Upcoming
12

3+
## Updates
4+
5+
- Box: move out of experimental. Experimental version is kept for backward compatibility but deprecated. Will be removed in a future release.
6+
- Box: rename spacing props values from "default" to "medium".
7+
- Box: update Box docs.
28

39
# 7.1.3
410
- Update to CONTRIBUTING.md about installing lerna.
@@ -12,6 +18,7 @@
1218
# 7.1.2
1319

1420
## New Component
21+
1522
- Add TopNav component
1623

1724
# 7.1.1

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

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

packages/visual-stack-docs/src/components/Demo/index.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@ export const Snippet = ({ tag, src }) => {
2323
);
2424
};
2525

26+
export const MarginTopSnippet = ({ tag, src }) => {
27+
const srcTag = R.view(R.lensPath([tag]))(src);
28+
if (!srcTag) return null;
29+
return (
30+
<div className="snippet margin-top-snippet">
31+
<pre>{trimLeadingWhiteSpace(src[tag]).join('\n')}</pre>
32+
</div>
33+
);
34+
};
35+
2636
export class Demo extends React.Component {
2737
constructor(props) {
2838
super(props);
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
.snippet {
1+
.snippet pre {
2+
margin: 0;
3+
}
4+
5+
.margin-top-snippet {
26
margin-top: 10px;
37
}
48

9+
.margin-top-snippet pre {
10+
margin: 0 0 1.6rem;
11+
}
12+
513
.inline-snippet {
614
margin: 0;
715
}

packages/visual-stack-docs/src/containers/Components/Docs/alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Body, Header, Panel } from '@cjdev/visual-stack/lib/components/Panel';
3-
import { Demo, Snippet } from '../../../components/Demo';
3+
import { Demo, MarginTopSnippet as Snippet } from '../../../components/Demo';
44
import { Button } from '@cjdev/visual-stack/lib/components/Button';
55
/* s1:start */
66
import { openAlert, closeAlert } from '@cjdev/visual-stack-redux';

packages/visual-stack-docs/src/containers/Components/Docs/badge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Panel, Body } from '@cjdev/visual-stack/lib/components/Panel';
3-
import { Demo, Snippet } from '../../../components/Demo';
3+
import { Demo, MarginTopSnippet as Snippet } from '../../../components/Demo';
44
/* s1:start */
55
import { Badge } from '@cjdev/visual-stack';
66
/* s1:end */

packages/visual-stack-docs/src/containers/Components/Docs/blankslate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Panel, Body, Header } from '@cjdev/visual-stack/lib/components/Panel';
3-
import { Demo, Snippet } from '../../../components/Demo';
3+
import { Demo, MarginTopSnippet as Snippet } from '../../../components/Demo';
44
import IconExample from 'mdi-react/BlurIcon';
55

66
import {

0 commit comments

Comments
 (0)