Skip to content

Commit 2e9fbc2

Browse files
authored
Merge branch 'develop' into master
2 parents 45218d7 + f6fad81 commit 2e9fbc2

File tree

8 files changed

+21591
-58
lines changed

8 files changed

+21591
-58
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ node_modules
33
*.log
44
.idea
55
/example/data/Tokens
6-
dist/**
6+
/dist/**

example/data/geopoint.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"schema": {
3+
"type": "object",
4+
"title": "Geo point",
5+
"required": [
6+
"type",
7+
"coordinates"
8+
],
9+
"properties": {
10+
"type": {
11+
"type": "string",
12+
"enum": [
13+
"Point"
14+
],
15+
"default": [
16+
"Point"
17+
]
18+
},
19+
"coordinates": {
20+
"type": "array",
21+
"minItems": 2,
22+
"maxItems": 2,
23+
"items": {
24+
"type": "number"
25+
}
26+
}
27+
}
28+
},
29+
"form": [
30+
{
31+
"key": "type"
32+
},
33+
{
34+
"key": "coordinates",
35+
"add": "New",
36+
"style": {
37+
"add": "btn-success"
38+
}
39+
}
40+
]
41+
}

example/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles';
44
const ExamplePage = require('./ExamplePage');
55
const theme = createMuiTheme({
66
typography: {
7+
useNextVariants: true,
78
fontSize: 22,
89
},
910
});

0 commit comments

Comments
 (0)