ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-26 16:10:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into matchingbrackets_addon

Browse Source
This commit is contained in:
Orange Mug
2020-01-19 08:29:25 +00:00
committed by GitHub
parent 6b245c9894 fb49a3abe5
commit 49dba02e8f
8 changed files with 16 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/layers/JSONEditor.jsx
View File

@@ -107,18 +107,6 @@ class JSONEditor extends React.Component {
}
render() {
const codeMirrorOptions = {
mode: {name: "javascript", json: true},
tabSize: 2,
theme: 'maputnik',
viewportMargin: Infinity,
lineNumbers: true,
lint: true,
matchBrackets: true,
gutters: ["CodeMirror-lint-markers"],
scrollbarStyle: "null",
}
const style = {};
if (this.props.maxHeight) {
style.maxHeight = this.props.maxHeight;

1
src/components/map/MapboxGlMap.jsx
View File

@@ -124,6 +124,7 @@ export default class MapboxGlMap extends React.Component {
container: this.container,
style: this.props.mapStyle,
hash: true,
maxZoom: 24
}
const map = new MapboxGl.Map(mapOpts);

10
src/config/styles.json
View File

@@ -8,31 +8,31 @@
{
"id": "klokantech-basic",
"title": "Klokantech Basic",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/klokantech-basic-gl-style@e142f83/style.json",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/klokantech-basic-gl-style@v1.9/style.json",
"thumbnail": "https://maputnik.github.io/thumbnails/klokantech-basic.png"
},
{
"id": "dark-matter",
"title": "Dark Matter",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/dark-matter-gl-style@1dcc1d3/style.json",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/dark-matter-gl-style@v1.8/style.json",
"thumbnail": "https://maputnik.github.io/thumbnails/dark-matter.png"
},
{
"id": "positron",
"title": "Positron",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/positron-gl-style@2877814/style.json",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/positron-gl-style@v1.8/style.json",
"thumbnail": "https://maputnik.github.io/thumbnails/positron.png"
},
{
"id": "osm-bright",
"title": "OSM Bright",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/osm-bright-gl-style@500e26e/style.json",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/osm-bright-gl-style@v1.9/style.json",
"thumbnail": "https://maputnik.github.io/thumbnails/osm-bright.png"
},
{
"id": "toner-gl-style",
"title": "Toner",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/toner-gl-style@bb49571/style.json",
"url": "https://cdn.jsdelivr.net/gh/openmaptiles/toner-gl-style@dcb6e64/style.json",
"thumbnail": "https://maputnik.github.io/thumbnails/toner.png"
},
{

4
src/styles/_react-collapse.scss
View File

@@ -7,3 +7,7 @@
flex: 1;
}
}
.ReactCollapse--collapse {
transition: height 180ms;
}