Skip to content

Commit 7c247c3

Browse files
authored
Merge pull request mac-s-g#32 from mac-s-g/base-16-styles
STYLES
2 parents bcafd2e + 4fbefca commit 7c247c3

31 files changed

+580
-491
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ You can use Docker to run the source code in a local development environment:
7272
* *note:* you may need to use `sudo` to run docker commands
7373
4. Run the docker container on port 2000. This will run the webpack-dev-server with hot-reloading enabled.
7474
* `cd react-json-view`
75-
* `./docker/server.sh`
75+
* `./docker/dev-server.sh`
7676
* *note:* you may need to use `sudo` to run the server file
7777
5. Open port 2000 in your browser
7878
* navigate to localhost:2000

doc/logo-alt-bold.png

-5.76 KB
Binary file not shown.

doc/output-example-monokai.png

30 KB
Loading

doc/output-example-solarized.png

15 KB
Loading

docker/server.sh renamed to docker/dev-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ docker run \
2121
--name=react-json-view \
2222
-e NODE_ENV=$NODE_ENV \
2323
--publish 2000:2000 \
24-
--entrypoint=/react/entrypoints/server.sh \
24+
--entrypoint=/react/entrypoints/dev-server.sh \
2525
-t react-json-view
File renamed without changes.

example/example.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@
2121
font-size:14px;
2222
font-family: monospace;
2323
}
24+
.example {padding: 5px;}
2425
</style>
2526
</head>
2627
<body>
2728
<div id="app-container">
2829
<div class="code-comment">// example 1: JSON object</div>
29-
<div id="example1"></div>
30+
<div class="example" id="example1"></div>
3031
<br />
3132
<div class="code-comment">// example 2: array input</div>
32-
<div id="example2"></div>
33+
<div class="example" id="example2"></div>
3334
<br />
3435
<div class="code-comment">// example 3: collapsed by default</div>
35-
<div id="example3"></div>
36+
<div class="example" id="example3"></div>
3637
</div>
3738
<script src="https://unpkg.com/react@15/dist/react.js"></script>
3839
<script src="https://unpkg.com/react-dom@15/dist/react-dom.js"></script>

example/example.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ ReactDom.render(
1515

1616
<br />
1717

18+
{/* use a base16 theme */}
19+
<JsonViewer src={getExampleJson1()} theme='monokai' />
20+
21+
<br />
22+
1823
{/* initialize this one with a name and default collapsed */}
1924
<JsonViewer
2025
src={getExampleJson2()}

package.json

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "react-json-view",
33
"description": "interactive json viewer wrapped up in a react component",
4-
"version": "1.6.1",
4+
"version": "1.7.0",
55
"main": "dist/main.js",
66
"files": [
77
"dist/"
@@ -31,9 +31,11 @@
3131
"jsdom": "^9.12.0",
3232
"mocha": "^3.2.0",
3333
"node-sass": "^3.8.0",
34+
"radium":"^0.18.2",
3435
"react": "^15.4.2",
3536
"react-addons-css-transition-group": "^15.4.2",
3637
"react-addons-test-utils": "^15.4.1",
38+
"react-base16-styling": "^0.5.3",
3739
"react-dom": "^15.4.2",
3840
"react-hot-loader": "^3.0.0-beta.6",
3941
"react-icons": "^2.2.3",
@@ -58,27 +60,10 @@
5860
"url": "https://github.com/mac-s-g/react-json-view.git"
5961
},
6062
"keywords": [
61-
"component",
62-
"interactive",
63-
"interactive-json",
64-
"json",
65-
"json-component",
66-
"json-display",
67-
"json-tree",
68-
"json-view",
63+
"array-viewer",
6964
"json-viewer",
70-
"pretty",
7165
"pretty-print",
72-
"print",
73-
"print-json",
74-
"react",
75-
"reactjs",
76-
"react-component",
77-
"react-json",
78-
"responsive",
79-
"responsive-json",
80-
"view",
81-
"viewer"
66+
"react"
8267
],
8368
"license": "MIT",
8469
"author": "Mac Gainor",

src/html/index.html.template

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-shim.js"></script>
1616
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-sham.js"></script>
1717
<![endif]-->
18+
<style>
19+
.react-json-view {
20+
padding: 4px 6px;
21+
border-radius: 3px;
22+
}
23+
</style>
1824
</head>
1925
<body>
2026
<div id="app-container"></div>

0 commit comments

Comments
 (0)